Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 12477:1550ef7117c4
Add detection of nsa streamed by aol ultravox server
author | rtognimp |
---|---|
date | Fri, 14 May 2004 23:10:43 +0000 |
parents | 860bc06f32ca |
children | 162c80b2d432 |
rev | line source |
---|---|
1 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <string.h> | |
5 #include <signal.h> | |
6 | |
7 #include "config.h" | |
8 #include "video_out.h" | |
9 #include "video_out_internal.h" | |
10 | |
11 | |
12 #include <X11/Xlib.h> | |
13 #include <X11/Xutil.h> | |
4036 | 14 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
15 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
16 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
17 #endif |
1 | 18 #include <errno.h> |
19 | |
31 | 20 #include "x11_common.h" |
21 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
22 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
23 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
24 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
25 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
26 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
27 static int Shmem_Flag; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
28 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
29 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
30 static int gXErrorFlag; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
31 static int CompletionType=-1; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
32 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
33 /* since it doesn't seem to be defined on some platforms */ |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
34 int XShmGetEventBase( Display* ); |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
35 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 |
354 | 37 #include "fastmemcpy.h" |
616 | 38 #include "sub.h" |
350 | 39 |
2218 | 40 #include "../postproc/swscale.h" |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
41 #include "../postproc/swscale_internal.h" //FIXME |
2556 | 42 #include "../postproc/rgb2rgb.h" |
10233
35f52ad860a0
vf_scale.h & related cleanup & some small warning fix by dominik
michael
parents:
10212
diff
changeset
|
43 #include "../libmpcodecs/vf_scale.h" |
2218 | 44 |
4734 | 45 #include "../mp_msg.h" |
46 | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
47 #ifdef HAVE_NEW_GUI |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
48 #include "../Gui/interface.h" |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
49 #include "../mplayer.h" |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
50 #endif |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
51 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7964
diff
changeset
|
52 static vo_info_t info = |
1 | 53 { |
54 "X11 ( XImage/Shm )", | |
55 "x11", | |
56 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
57 "" | |
58 }; | |
59 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7964
diff
changeset
|
60 LIBVO_EXTERN( x11 ) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7964
diff
changeset
|
61 |
1 | 62 /* private prototypes */ |
63 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
|
64 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
1 | 65 |
66 /* local data */ | |
67 static unsigned char *ImageData; | |
68 | |
69 /* X11 related variables */ | |
7764 | 70 static XImage *myximage = NULL; |
1 | 71 static int depth,bpp,mode; |
72 static XWindowAttributes attribs; | |
73 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
74 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
75 |
2969 | 76 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
77 static int zoomFlag; |
2969 | 78 |
1 | 79 |
80 static uint32_t image_width; | |
81 static uint32_t image_height; | |
4641 | 82 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
|
83 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
|
84 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
|
85 static int srcH=-1; |
4641 | 86 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing |
1 | 87 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
88 static int old_vo_dwidth=-1; |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
89 static int old_vo_dheight=-1; |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
90 |
31 | 91 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
|
92 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
|
93 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
94 /* clear left over borders and redraw frame if we are paused */ |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
95 if ( ret & VO_EVENT_EXPOSE && int_pause) |
4808
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
96 { |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
97 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, myximage->height, 0); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
98 flip_page(); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
99 } else |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
100 if ( (ret & VO_EVENT_RESIZE)||(ret & VO_EVENT_EXPOSE) ) |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
101 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, myximage->height, 0); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
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; |
5935 | 136 mp_msg(MSGT_VO,MSGL_WARN, "Shared memory not supported\nReverting to normal Xlib\n" ); |
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 } |
a7bac05524a1
real 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 ); |
5935 | 146 mp_msg(MSGT_VO,MSGL_WARN,"Shared memory error,disabling ( Ximage error )\n" ); |
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
|
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 ); |
5935 | 155 mp_msg(MSGT_VO,MSGL_V, "%s\n",strerror( errno ) ); |
156 //perror( strerror( errno ) ); | |
157 mp_msg(MSGT_VO,MSGL_WARN,"Shared memory error,disabling ( seg id error )\n" ); | |
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
|
158 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
|
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 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); |
3209 | 161 |
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
|
162 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
|
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 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
|
165 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr ); |
5935 | 166 mp_msg(MSGT_VO,MSGL_WARN, "Shared memory error,disabling ( address error )\n" ); |
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
|
167 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
|
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 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
|
170 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
|
171 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
|
172 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
|
173 |
a7bac05524a1
real 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 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
|
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 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
|
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 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
|
179 shmdt( Shminfo[0].shmaddr ); |
5935 | 180 mp_msg(MSGT_VO,MSGL_WARN, "Shared memory error,disabling.\n" ); |
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
|
181 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
|
182 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
|
183 } |
a7bac05524a1
real 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 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
|
185 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
|
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 { |
a7bac05524a1
real 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 static int firstTime=1; |
5935 | 189 if ( firstTime){ |
190 mp_msg(MSGT_VO,MSGL_V, "Sharing memory.\n" ); | |
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
|
191 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
|
192 } |
a7bac05524a1
real 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 } |
a7bac05524a1
real 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 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
|
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 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
|
198 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
|
199 #endif |
4804 | 200 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
|
201 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
|
202 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
|
203 #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
|
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 #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
|
206 } |
a7bac05524a1
real 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 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
|
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 #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
|
211 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
|
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 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
|
214 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
|
215 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
|
216 } |
a7bac05524a1
real 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 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
|
218 #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
|
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 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
|
221 } |
5414 | 222 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
|
223 } |
2218 | 224 |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6953
diff
changeset
|
225 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) |
1 | 226 { |
1110 | 227 // int screen; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
228 int fullscreen=0; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
229 int vm=0; |
1110 | 230 // int interval, prefer_blank, allow_exp, nothing; |
1 | 231 unsigned int fg,bg; |
232 XEvent xev; | |
233 XGCValues xgcv; | |
234 Colormap theCmap; | |
235 XSetWindowAttributes xswa; | |
236 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
237 #ifdef HAVE_XF86VM |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
238 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
|
239 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
240 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
241 #endif |
1 | 242 |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
243 vo_mouse_autohide=1; |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
244 old_vo_dwidth=-1; |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
245 old_vo_dheight=-1; |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
246 |
4813 | 247 if (!title) |
248 title = strdup("MPlayer X11 (XImage/Shm) render"); | |
249 | |
4641 | 250 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
|
251 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
|
252 srcH= height; |
6043 | 253 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; |
10728 | 254 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight); |
6858
21186a5514b4
initial window size (-xy) fixed - patch by Kazunori Ueno <jagarl@creator.club.ne.jp>
arpi
parents:
6704
diff
changeset
|
255 vo_dwidth=d_width; vo_dheight=d_height; |
4641 | 256 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
257 if( flags&0x03 ) fullscreen = 1; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
258 if( flags&0x02 ) vm = 1; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
259 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
|
260 zoomFlag = flags&0x04; |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
261 |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
262 int_pause = 0; |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
263 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
2218 | 264 |
265 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); | |
1746 | 266 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
267 XGetWindowAttributes( mDisplay,mRootWin,&attribs ); |
1746 | 268 depth=attribs.depth; |
269 | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7124
diff
changeset
|
270 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) { |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7124
diff
changeset
|
271 Visual *visual; |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7124
diff
changeset
|
272 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7124
diff
changeset
|
273 } |
9278
caea8ed36b48
The reason why mplayer crashes (in some cases) when using x11
arpi
parents:
9115
diff
changeset
|
274 if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ) || |
10212
d358fa9a1068
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10177
diff
changeset
|
275 (WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
276 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); |
1746 | 277 |
4697 | 278 /* set image size (which is indeed neither the input nor output size), |
11000 | 279 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here |
4697 | 280 */ |
281 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
|
282 image_height=height; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
283 |
4641 | 284 aspect= ((1<<16)*d_width + d_height/2)/d_height; |
2218 | 285 |
1752 | 286 #ifdef HAVE_NEW_GUI |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
287 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
288 else |
1752 | 289 #endif |
1746 | 290 { |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
291 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
292 if ( vm ) |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
293 { |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
294 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
|
295 { 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
|
296 else |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
297 { 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
|
298 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height); |
6045
a4705acc43e5
fix Nil's vo_x11 bug (Nilmoni Deb <ndeb@ece.cmu.edu>)
pontscho
parents:
6043
diff
changeset
|
299 vo_dx=(vo_screenwidth-modeline_width)/2; |
a4705acc43e5
fix Nil's vo_x11 bug (Nilmoni Deb <ndeb@ece.cmu.edu>)
pontscho
parents:
6043
diff
changeset
|
300 vo_dy=(vo_screenheight-modeline_height)/2; |
a4705acc43e5
fix Nil's vo_x11 bug (Nilmoni Deb <ndeb@ece.cmu.edu>)
pontscho
parents:
6043
diff
changeset
|
301 vo_dwidth=modeline_width; |
a4705acc43e5
fix Nil's vo_x11 bug (Nilmoni Deb <ndeb@ece.cmu.edu>)
pontscho
parents:
6043
diff
changeset
|
302 vo_dheight=modeline_height; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
303 } |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
304 #endif |
1746 | 305 bg=WhitePixel( mDisplay,mScreen ); |
306 fg=BlackPixel( mDisplay,mScreen ); | |
1 | 307 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
308 theCmap=vo_x11_create_colormap(&vinfo); |
1 | 309 |
1746 | 310 xswa.background_pixel=0; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
311 xswa.border_pixel=0; |
9278
caea8ed36b48
The reason why mplayer crashes (in some cases) when using x11
arpi
parents:
9115
diff
changeset
|
312 xswa.colormap=theCmap; |
caea8ed36b48
The reason why mplayer crashes (in some cases) when using x11
arpi
parents:
9115
diff
changeset
|
313 xswamask=CWBackPixel | CWBorderPixel | CWColormap; |
1 | 314 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
315 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
316 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
317 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
318 xswa.override_redirect=True; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
319 xswamask|=CWOverrideRedirect; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
320 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
321 #endif |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
322 |
3830 | 323 if ( WinID>=0 ){ |
6043 | 324 vo_window = WinID ? ((Window)WinID) : mRootWin; |
325 if ( WinID ) | |
326 { | |
327 XUnmapWindow( mDisplay,vo_window ); | |
328 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6858
diff
changeset
|
329 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); |
6693 | 330 XMapWindow( mDisplay,vo_window ); |
6043 | 331 } else XSelectInput( mDisplay,vo_window,ExposureMask ); |
3655 | 332 } |
333 else | |
6043 | 334 { |
7764 | 335 if ( vo_window == None ) |
336 { | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
337 vo_window=vo_x11_create_smooth_window( mDisplay,mRootWin,vinfo.visual, vo_dx, vo_dy, vo_dwidth, vo_dheight, depth, theCmap ); |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
338 |
7764 | 339 vo_x11_classhint( mDisplay,vo_window,"x11" ); |
340 vo_hidecursor(mDisplay,vo_window); | |
341 vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); | |
342 XSelectInput( mDisplay,vo_window,StructureNotifyMask ); | |
343 XStoreName( mDisplay,vo_window,title ); | |
344 XMapWindow( mDisplay,vo_window ); | |
345 // if(WinID!=0) | |
346 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window ); | |
347 | |
348 if ( fullscreen ) vo_x11_fullscreen(); | |
6043 | 349 #ifdef HAVE_XINERAMA |
7764 | 350 vo_x11_xinerama_move(mDisplay,vo_window); |
6043 | 351 #endif |
7764 | 352 } else if ( !fullscreen ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight ); |
6043 | 353 } |
354 | |
1746 | 355 XFlush( mDisplay ); |
356 XSync( mDisplay,False ); | |
1 | 357 |
5822 | 358 // we cannot grab mouse events on root window :( |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6858
diff
changeset
|
359 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | ExposureMask | |
5822 | 360 ((WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) ); |
4805 | 361 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
362 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
363 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
364 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
365 /* Grab the mouse pointer in our window */ |
7539
56ea9db91251
-nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents:
7256
diff
changeset
|
366 if(vo_grabpointer) |
4804 | 367 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
|
368 GrabModeAsync, GrabModeAsync, |
4804 | 369 vo_window, None, CurrentTime); |
370 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
|
371 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
372 #endif |
1746 | 373 } |
1 | 374 |
7765 | 375 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); |
6043 | 376 vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); |
7764 | 377 |
7765 | 378 if ( myximage ) |
379 { | |
380 freeMyXImage(); | |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
381 sws_freeContext(swsContext); |
7765 | 382 } |
6043 | 383 getMyXImage(); |
384 | |
385 if ( !WinID ) | |
386 { vo_dwidth=vo_screenwidth; vo_dheight=vo_screenheight; } | |
1 | 387 |
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
|
388 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
|
389 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
|
390 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
|
391 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
|
392 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
|
393 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
|
394 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
|
395 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
|
396 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
|
397 }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
|
398 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
|
399 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
|
400 }break; |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
401 case 8: draw_alpha_fnc=draw_alpha_null; |
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
402 out_format= IMGFMT_BGR8; break; |
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
|
403 default: draw_alpha_fnc=draw_alpha_null; |
1 | 404 } |
405 | |
5368
fdb92215a1fc
Fix resizing when zoom is used and image size changes between frames.
atmos4
parents:
5248
diff
changeset
|
406 /* always allocate swsContext as size could change between frames */ |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
407 swsContext= sws_getContextFromCmdLine(width, height, in_format, width, height, out_format ); |
10177
9cee07f898f7
swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext
alex
parents:
10176
diff
changeset
|
408 if (!swsContext) |
9cee07f898f7
swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext
alex
parents:
10176
diff
changeset
|
409 return -1; |
1 | 410 |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
411 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 412 |
413 // If we have blue in the lowest bit then obviously RGB | |
414 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
415 #ifdef WORDS_BIGENDIAN | |
416 if ( myximage->byte_order != MSBFirst ) | |
417 #else | |
418 if ( myximage->byte_order != LSBFirst ) | |
419 #endif | |
420 { | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
421 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB; |
4382 | 422 // 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
|
423 // return -1; |
1 | 424 } |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
425 |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
426 #ifdef WORDS_BIGENDIAN |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
427 if(mode==MODE_BGR && bpp!=32){ |
5935 | 428 mp_msg(MSGT_VO,MSGL_ERR,"BGR%d not supported, please contact the developers\n", bpp); |
4641 | 429 return -1; |
430 } | |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
431 #else |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
432 if(mode==MODE_BGR){ |
5935 | 433 mp_msg(MSGT_VO,MSGL_ERR,"BGR not supported, please contact the developers\n"); |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
434 return -1; |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
435 } |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
436 #endif |
1 | 437 |
4316 | 438 saver_off(mDisplay); |
11542 | 439 |
440 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
441 | |
1 | 442 return 0; |
443 } | |
444 | |
445 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
446 { | |
3003 | 447 #ifdef HAVE_SHM |
1 | 448 if ( Shmem_Flag ) |
449 { | |
4804 | 450 XShmPutImage( mDisplay,vo_window,vo_gc,myximage, |
1 | 451 0,0, |
4641 | 452 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
453 swsContext->dstW,myximage->height,True ); | |
1 | 454 } |
455 else | |
456 #endif | |
457 { | |
4804 | 458 XPutImage( mDisplay,vo_window,vo_gc,myximage, |
1 | 459 0,0, |
4641 | 460 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
461 swsContext->dstW,myximage->height); | |
1 | 462 } |
463 } | |
464 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
465 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
466 { 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
|
467 |
31 | 468 static void flip_page( void ){ |
469 Display_Image( myximage,ImageData ); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
470 XSync(mDisplay, False); |
31 | 471 } |
1 | 472 |
473 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
474 { | |
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
|
475 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
|
476 int dstStride[3]; |
6059 | 477 |
4734 | 478 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
|
479 { |
4641 | 480 int newW= vo_dwidth; |
481 int newH= vo_dheight; | |
482 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
|
483 SwsContext *oldContext= swsContext; |
4340 | 484 |
4641 | 485 if(newAspect>aspect) newW= (newH*aspect + (1<<15))>>16; |
4662 | 486 else newH= ((newW<<16) + (aspect>>1)) /aspect; |
4641 | 487 |
488 old_vo_dwidth= vo_dwidth; | |
489 old_vo_dheight= vo_dheight; | |
490 | |
491 if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
492 | |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
493 swsContext= sws_getContextFromCmdLine(srcW, srcH, in_format, |
4541 | 494 newW, newH, out_format); |
495 if(swsContext) | |
496 { | |
4627 | 497 image_width= (newW+7)&(~7); |
4541 | 498 image_height= newH; |
4627 | 499 |
4541 | 500 freeMyXImage(); |
501 getMyXImage(); | |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
502 sws_freeContext(oldContext); |
4541 | 503 } |
504 else | |
505 { | |
506 swsContext= oldContext; | |
507 } | |
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
|
508 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
509 dstStride[1]= |
4641 | 510 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
|
511 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
|
512 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
|
513 |
4641 | 514 if(Flip_Flag) |
515 { | |
516 dstStride[0]= -image_width*((bpp+7)/8); | |
517 dst[0]=ImageData - dstStride[0]*(image_height-1); | |
9697 | 518 sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride); |
4641 | 519 } |
520 else | |
521 { | |
522 dstStride[0]=image_width*((bpp+7)/8); | |
523 dst[0]=ImageData; | |
9697 | 524 sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride); |
4641 | 525 } |
526 return 0; | |
1 | 527 } |
528 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
529 static uint32_t draw_frame( uint8_t *src[] ){ |
7683 | 530 #if 0 |
4512
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
531 int stride[3]= {0,0,0}; |
4641 | 532 |
4726 | 533 if (in_format==IMGFMT_YUY2) stride[0]=srcW*2; |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
534 else if(in_format==IMGFMT_BGR8) stride[0]=srcW; |
4726 | 535 else if(in_format==IMGFMT_BGR15) stride[0]=srcW*2; |
536 else if(in_format==IMGFMT_BGR16) stride[0]=srcW*2; | |
537 else if(in_format==IMGFMT_BGR24) stride[0]=srcW*3; | |
538 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
|
539 |
4726 | 540 return draw_slice(src, stride, srcW, srcH, 0, 0); |
7683 | 541 #else |
542 printf("draw_frame() called!!!!!!\n"); | |
543 return -1; | |
544 #endif | |
545 } | |
546 | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
547 static uint32_t get_image(mp_image_t *mpi) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
548 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
549 if (zoomFlag || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
550 !IMGFMT_IS_BGR(mpi->imgfmt) || |
5416 | 551 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
552 ((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
553 (mpi->flags & MP_IMGFLAG_PLANAR) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
554 (mpi->flags & MP_IMGFLAG_YUV) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
555 (mpi->width != image_width) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
556 (mpi->height != image_height) |
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 return(VO_FALSE); |
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 if (Flip_Flag) |
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 mpi->stride[0] = -image_width*((bpp+7)/8); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
563 mpi->planes[0] = ImageData - mpi->stride[0]*(image_height-1); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
564 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
565 else |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
566 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
567 mpi->stride[0] = image_width*((bpp+7)/8); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
568 mpi->planes[0] = ImageData; |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
569 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
570 mpi->flags |= MP_IMGFLAG_DIRECT; |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
571 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
572 return(VO_TRUE); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
573 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
574 |
1 | 575 static uint32_t query_format( uint32_t format ) |
576 { | |
5935 | 577 mp_msg(MSGT_VO,MSGL_DBG2,"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
|
578 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
579 { |
10177
9cee07f898f7
swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext
alex
parents:
10176
diff
changeset
|
580 if (IMGFMT_BGR_DEPTH(format) <= 8) |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
581 return 0; // TODO 8bpp not yet fully implemented |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
582 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) |
7689
39e62d6592ca
since draw_slice() supports RGB/BGR, we don't need draw_image() for stride
arpi
parents:
7683
diff
changeset
|
583 return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP|VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
584 else |
7689
39e62d6592ca
since draw_slice() supports RGB/BGR, we don't need draw_image() for stride
arpi
parents:
7683
diff
changeset
|
585 return 1|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP|VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
586 } |
325 | 587 |
1 | 588 switch( format ) |
324 | 589 { |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
590 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
591 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
592 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
593 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
594 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
595 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
596 // case IMGFMT_YUY2: |
4340 | 597 case IMGFMT_I420: |
598 case IMGFMT_IYUV: | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
599 case IMGFMT_YV12: |
7689
39e62d6592ca
since draw_slice() supports RGB/BGR, we don't need draw_image() for stride
arpi
parents:
7683
diff
changeset
|
600 return 1|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_ACCEPT_STRIDE; |
324 | 601 } |
1 | 602 return 0; |
603 } | |
604 | |
605 | |
7683 | 606 static void uninit(void) |
1 | 607 { |
5414 | 608 if(!myximage) return; |
609 | |
4443
cf62fa252821
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents:
4433
diff
changeset
|
610 freeMyXImage(); |
4316 | 611 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
|
612 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
613 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
614 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
615 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
616 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
617 zoomFlag=0; |
6095 | 618 vo_x11_uninit(); |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
619 |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9278
diff
changeset
|
620 sws_freeContext(swsContext); |
1 | 621 } |
622 | |
4352 | 623 static uint32_t preinit(const char *arg) |
624 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
625 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
|
626 { |
5935 | 627 mp_msg(MSGT_VO,MSGL_ERR,"vo_x11: Unknown subdevice: %s\n",arg); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
628 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
|
629 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
630 |
7683 | 631 if( !vo_init() ) return -1; // Can't open X11 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
632 return 0; |
4352 | 633 } |
1 | 634 |
4596 | 635 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 636 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
637 switch (request) { |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
638 case VOCTRL_PAUSE: return (int_pause=1); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
639 case VOCTRL_RESUME: return (int_pause=0); |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
640 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
641 return query_format(*((uint32_t*)data)); |
4734 | 642 case VOCTRL_GUISUPPORT: |
643 return VO_TRUE; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
644 case VOCTRL_GET_IMAGE: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
645 return get_image(data); |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
646 case VOCTRL_SET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
647 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
648 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
649 int value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
650 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
651 value = va_arg(ap, int); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
652 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
653 return vo_x11_set_equalizer(data, value); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
654 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
655 case VOCTRL_GET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
656 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
657 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
658 int *value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
659 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
660 value = va_arg(ap, int *); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
661 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
662 return vo_x11_get_equalizer(data, value); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
663 } |
11542 | 664 case VOCTRL_ONTOP: |
665 vo_x11_ontop(); | |
666 return VO_TRUE; | |
4734 | 667 case VOCTRL_FULLSCREEN: |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
668 { |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
669 vo_x11_fullscreen(); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
670 vo_x11_clearwindow(mDisplay, vo_window); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
671 } |
4790 | 672 return VO_TRUE; |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
673 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
674 return VO_NOTIMPL; |
4352 | 675 } |