annotate libvo/vo_x11.c @ 6016:be9cd7d845c2

-zoom, -fs with x[11|mga|v] fix -- round two
author pontscho
date Wed, 08 May 2002 20:24:35 +0000
parents 7f6e02a16ac4
children 4dc96c97ac07
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 #define DISP
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 * video_out_x11.c,X11 interface
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 * Copyright ( C ) 1996,MPEG Software Simulation Group. All Rights Reserved.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 * Hacked into mpeg2dec by
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 * 15 & 16 bpp support added by Franck Sicard <Franck.Sicard@solsoft.fr>
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
14 * use swScaler instead of lots of tricky converters by Michael Niedermayer <michaelni@gmx.at>
4734
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
15 * runtime fullscreen switching by alex
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include <signal.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 LIBVO_EXTERN( x11 )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <X11/Xutil.h>
4036
76ea6f97ebb7 added rgb24to32 instead of c converter
alex
parents: 4017
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
38 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
39
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
40 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
41 #include "sub.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
42
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
43 #include "../postproc/swscale.h"
2556
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
44 #include "../postproc/rgb2rgb.h"
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
45
4734
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
46 #include "../mp_msg.h"
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
47
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
48 #ifdef HAVE_NEW_GUI
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
49 #include "../Gui/interface.h"
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
50 #include "../mplayer.h"
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
51 #endif
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
52
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 static vo_info_t vo_info =
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 "X11 ( XImage/Shm )",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 "x11",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 ""
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 /* private prototypes */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 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
63 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 static unsigned char *ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 /* X11 related variables */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 static XImage *myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 static int depth,bpp,mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
73 static int Flip_Flag;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
74 static int zoomFlag;
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
75
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
76 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static int Shmem_Flag;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
82 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ?
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static XShmSegmentInfo Shminfo[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static int gXErrorFlag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 static int CompletionType=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86
4813
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
87 /* since it doesn't seem to be defined on some platforms */
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
88 int XShmGetEventBase( Display* );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static uint32_t image_height;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
93 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
94 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
95 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
96 static int srcH=-1;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
97 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
99 static int old_vo_dwidth=-1;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
100 static int old_vo_dheight=-1;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
101
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
102 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
103 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
104
4eaa205201b0 clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents: 4805
diff changeset
105 /* 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
106 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
107 {
4eaa205201b0 clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents: 4805
diff changeset
108 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
109 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
110 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
113 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
114 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
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_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
118 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
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_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
122 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
123 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
124
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
125 static void draw_alpha_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
126 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
127 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
128
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
129 static void draw_alpha_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
130 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
131
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
132 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
133 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
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 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
136
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
137 static 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
138 {
a7bac05524a1 real 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 #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
140 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
141 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
142 {
a7bac05524a1 real 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 Shmem_Flag=0;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
144 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
145 }
a7bac05524a1 real 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 ( 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
147
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
148 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
149 {
a7bac05524a1 real 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=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
151 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
152 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
153 if ( myximage != NULL ) XDestroyImage( myximage );
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
154 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
155 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
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 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
158 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
159 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
160 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
161 {
a7bac05524a1 real 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 XDestroyImage( myximage );
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
163 mp_msg(MSGT_VO,MSGL_V, "%s\n",strerror( errno ) );
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
164 //perror( strerror( errno ) );
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
165 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
166 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
167 }
a7bac05524a1 real 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 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 );
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
169
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
170 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
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 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
173 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr );
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
174 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
175 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
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 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
178 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
179 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
180 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
181
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
182 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
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 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
185 {
a7bac05524a1 real 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 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
187 shmdt( Shminfo[0].shmaddr );
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
188 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
189 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
190 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
191 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
192 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
193 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
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 {
a7bac05524a1 real 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 static int firstTime=1;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
197 if ( firstTime){
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
198 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
199 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
200 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
201 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
202 }
a7bac05524a1 real 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 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
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 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
206 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
207 #endif
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
208 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
209 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
210 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
211 #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
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 #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
214 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
215
a7bac05524a1 real 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 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
217 {
a7bac05524a1 real 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 #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
219 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
220 {
a7bac05524a1 real 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 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
222 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
223 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
224 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
225 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
226 #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
227 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
228 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
229 }
5414
871f8ebecdef fix uninit() crash if no config() call
arpi
parents: 5368
diff changeset
230 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
231 }
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
232
4433
df8e0f71cc3c new info for tuning
nick
parents: 4426
diff changeset
233 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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234 {
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
235 // int screen;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
236 int fullscreen=0;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
237 int vm=0;
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
238 // int interval, prefer_blank, allow_exp, nothing;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 unsigned int fg,bg;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 XSizeHints hint;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241 XEvent xev;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 XGCValues xgcv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 Colormap theCmap;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 XSetWindowAttributes xswa;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 unsigned long xswamask;
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
246 #ifdef HAVE_XF86VM
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
247 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
248 static uint32_t vm_width;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
249 static uint32_t vm_height;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
250 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4813
diff changeset
252
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
253 vo_mouse_autohide=1;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
254 old_vo_dwidth=-1;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
255 old_vo_dheight=-1;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
256
4813
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
257 if (!title)
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
258 title = strdup("MPlayer X11 (XImage/Shm) render");
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
259
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
260 in_format=format;
5709
359926d98625 workaround yv12 vs. i420 'bug' of swscale
arpi
parents: 5651
diff changeset
261 if(in_format==IMGFMT_I420 || in_format==IMGFMT_IYUV) in_format=IMGFMT_YV12;
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
262 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
263 srcH= height;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
264 vo_dwidth=width; vo_dheight=height;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
265
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
266 if( flags&0x03 ) fullscreen = 1;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
267 if( flags&0x02 ) vm = 1;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
268 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
269 zoomFlag = flags&0x04;
4677
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
270 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
271
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
272 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
273
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
274 XGetWindowAttributes( mDisplay,mRootWin,&attribs );
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
275 depth=attribs.depth;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
276
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
277 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
278 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
279
4697
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
280 /* set image size (which is indeed neither the input nor output size),
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
281 if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
282 */
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
283 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
284 image_height=height;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
285
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
286 aspect= ((1<<16)*d_width + d_height/2)/d_height;
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
287
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
288 #ifdef HAVE_NEW_GUI
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
289 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
290 else
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
291 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
292 {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
293 hint.x=0;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
294 hint.y=0;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
295 // if(zoomFlag){
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
296 // hint.width=d_width;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
297 // hint.height=d_height;
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
298 // }else{
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6013
diff changeset
299 hint.width=width;
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6013
diff changeset
300 hint.height=height;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
301 // }
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
302
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
303 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
304 if ( vm )
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
305 {
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
306 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
307 { 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
308 else
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
309 { 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
310 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
311 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
312 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
313 hint.width=modeline_width;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
314 hint.height=modeline_height;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
315 }
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
316 else
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
317 #endif
5999
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
318 // if ( fullscreen )
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
319 // {
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
320 // hint.width=vo_screenwidth;
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
321 // hint.height=vo_screenheight;
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
322 // }
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
323 hint.flags=PPosition | PSize;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
325 bg=WhitePixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
326 fg=BlackPixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
327 vo_dwidth=hint.width;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
328 vo_dheight=hint.height;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
330 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
331 vinfo.visual,AllocNone );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
333 xswa.background_pixel=0;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
334 xswa.border_pixel=0;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
335 xswa.colormap=theCmap;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
336 xswamask=CWBackPixel | CWBorderPixel | CWColormap;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
337
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
338 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
339 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
340 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
341 xswa.override_redirect=True;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
342 xswamask|=CWOverrideRedirect;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
343 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
344 #endif
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
345
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3655
diff changeset
346 if ( WinID>=0 ){
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
347 vo_window = WinID ? ((Window)WinID) : RootWindow( mDisplay,mScreen );
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
348 XUnmapWindow( mDisplay,vo_window );
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
349 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
3655
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
350 }
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
351 else
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
352 vo_window=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 hint.x,hint.y,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354 hint.width,hint.height,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 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
356
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
357 vo_x11_classhint( mDisplay,vo_window,"x11" );
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
358 vo_hidecursor(mDisplay,vo_window);
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
359 XSelectInput( mDisplay,vo_window,StructureNotifyMask );
4813
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
360 XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
361 XMapWindow( mDisplay,vo_window );
5999
792d58595767 fix -fs and 'f'
pontscho
parents: 5955
diff changeset
362 if ( fullscreen ) vo_x11_fullscreen();
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3830
diff changeset
363 #ifdef HAVE_XINERAMA
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
364 vo_x11_xinerama_move(mDisplay,vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3830
diff changeset
365 #endif
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5709
diff changeset
366 if(WinID!=0)
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
367 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window );
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
368 XSelectInput( mDisplay,vo_window,NoEventMask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
370 XFlush( mDisplay );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
371 XSync( mDisplay,False );
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
372 vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5709
diff changeset
374 // we cannot grab mouse events on root window :(
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5822
diff changeset
375 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask |
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5709
diff changeset
376 ((WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) );
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4804
diff changeset
377
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
378 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
379 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
380 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
381 /* Grab the mouse pointer in our window */
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
382 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
383 GrabModeAsync, GrabModeAsync,
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
384 vo_window, None, CurrentTime);
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
385 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
386 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
387 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
388 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
389
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
390 getMyXImage();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
392 switch ((bpp=myximage->bits_per_pixel)){
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
393 case 24: draw_alpha_fnc=draw_alpha_24;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
394 out_format= IMGFMT_BGR24; break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
395 case 32: draw_alpha_fnc=draw_alpha_32;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
396 out_format= IMGFMT_BGR32; break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
397 case 15:
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
398 case 16: if (depth==15){
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
399 draw_alpha_fnc=draw_alpha_15;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
400 out_format= IMGFMT_BGR15;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
401 }else{
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
402 draw_alpha_fnc=draw_alpha_16;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
403 out_format= IMGFMT_BGR16;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
404 }break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
405 default: draw_alpha_fnc=draw_alpha_null;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
406 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
407
5368
fdb92215a1fc Fix resizing when zoom is used and image size changes between frames.
atmos4
parents: 5248
diff changeset
408 /* 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
409 swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
410
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
411 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
412
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
413 // If we have blue in the lowest bit then obviously RGB
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
414 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
415 #ifdef WORDS_BIGENDIAN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 if ( myximage->byte_order != MSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
418 if ( myximage->byte_order != LSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
419 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
2f540642e44d small typos in text
pl
parents: 4352
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
424 }
5248
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 #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
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
428 mp_msg(MSGT_VO,MSGL_ERR,"BGR%d not supported, please contact the developers\n", bpp);
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
429 return -1;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
430 }
5248
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
431 if(mode==MODE_RGB && bpp==32){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
432 mp_msg(MSGT_VO,MSGL_ERR,"RGB32 not supported on big-endian systems, please contact the developers\n");
5248
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
433 return -1;
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
434 }
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
435 #else
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
436 if(mode==MODE_BGR){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
437 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
438 return -1;
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
439 }
f23cea00d19c print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents: 5163
diff changeset
440 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
441
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4036
diff changeset
442 saver_off(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
443 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
444 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
445
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446 static const vo_info_t* get_info( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447 { return &vo_info; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
449 static void Display_Image( XImage *myximage,uint8_t *ImageData )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 #ifdef DISP
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
452 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
453 if ( Shmem_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
454 {
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
455 XShmPutImage( mDisplay,vo_window,vo_gc,myximage,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
456 0,0,
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
457 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2,
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
458 swsContext->dstW,myximage->height,True );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
459 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
460 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
461 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
462 {
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
463 XPutImage( mDisplay,vo_window,vo_gc,myximage,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464 0,0,
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
465 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2,
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
466 swsContext->dstW,myximage->height);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
467 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
469 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
470
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
471 static void draw_osd(void)
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
472 { 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
473
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
474 static void flip_page( void ){
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
475 Display_Image( myximage,ImageData );
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
476 XSync(mDisplay, False);
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
477 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
478
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
479 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
480 {
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
481 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
482 int dstStride[3];
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
483
4734
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
484 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
485 {
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
486 int newW= vo_dwidth;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
487 int newH= vo_dheight;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
488 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
489 SwsContext *oldContext= swsContext;
4340
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
490
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
491 if(newAspect>aspect) newW= (newH*aspect + (1<<15))>>16;
4662
90cf53f47ab7 minor rounding bugfix in the aspect stuff
michael
parents: 4661
diff changeset
492 else newH= ((newW<<16) + (aspect>>1)) /aspect;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
493
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
494 old_vo_dwidth= vo_dwidth;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
495 old_vo_dheight= vo_dheight;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
496
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
497 if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
498
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
499 swsContext= getSwsContextFromCmdLine(srcW, srcH, in_format,
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
500 newW, newH, out_format);
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
501 if(swsContext)
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
502 {
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
503 image_width= (newW+7)&(~7);
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
504 image_height= newH;
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
505
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
506 freeMyXImage();
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
507 getMyXImage();
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
508 freeSwsContext(oldContext);
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
509 }
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
510 else
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
511 {
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
512 swsContext= oldContext;
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
513 }
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
514 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
515 dstStride[1]=
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
516 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
517 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
518 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
519
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
520 if(Flip_Flag)
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
521 {
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
522 dstStride[0]= -image_width*((bpp+7)/8);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
523 dst[0]=ImageData - dstStride[0]*(image_height-1);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
524 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
525 }
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
526 else
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
527 {
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
528 dstStride[0]=image_width*((bpp+7)/8);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
529 dst[0]=ImageData;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
530 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
531 }
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
532 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
533 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
534
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
535 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
536 int stride[3]= {0,0,0};
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
537
4726
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
538 if (in_format==IMGFMT_YUY2) stride[0]=srcW*2;
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
539 else if(in_format==IMGFMT_BGR15) stride[0]=srcW*2;
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
540 else if(in_format==IMGFMT_BGR16) stride[0]=srcW*2;
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
541 else if(in_format==IMGFMT_BGR24) stride[0]=srcW*3;
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
542 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
543
4726
9ff121145b20 101 (NULL->srcW, NULL->srcH)
michael
parents: 4718
diff changeset
544 return draw_slice(src, stride, srcW, srcH, 0, 0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
545 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
310b06d372d0 check depth for direct rendering
arpi
parents: 5414
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
575 static uint32_t query_format( uint32_t format )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 {
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
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 {
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
580 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
5566
e01c664def74 VFCAP added
arpi
parents: 5416
diff changeset
581 return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
582 else
5566
e01c664def74 VFCAP added
arpi
parents: 5416
diff changeset
583 return 1|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
584 }
325
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
585
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
586 switch( format )
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
587 {
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
588 // case IMGFMT_BGR15:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
589 // case IMGFMT_BGR16:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
590 // case IMGFMT_BGR24:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
591 // case IMGFMT_BGR32:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
592 // return 0x2;
4905
eb1a28f1236a yuy2 support disabled to workaround stupid colorspace selection
michael
parents: 4889
diff changeset
593 // case IMGFMT_YUY2:
4340
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
594 case IMGFMT_I420:
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
595 case IMGFMT_IYUV:
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
596 case IMGFMT_YV12:
5566
e01c664def74 VFCAP added
arpi
parents: 5416
diff changeset
597 return 1|VFCAP_OSD|VFCAP_SWSCALE;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
598 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
601
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
603 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
604 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
605 {
5414
871f8ebecdef fix uninit() crash if no config() call
arpi
parents: 5368
diff changeset
606 if(!myximage) return;
871f8ebecdef fix uninit() crash if no config() call
arpi
parents: 5368
diff changeset
607
4443
cf62fa252821 removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents: 4433
diff changeset
608 freeMyXImage();
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4036
diff changeset
609 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
610
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
611 #ifdef HAVE_XF86VM
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
612 vo_vm_close(mDisplay);
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
613 #endif
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
614
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
615 zoomFlag=0;
4804
62a281be07ce fix nexus's key bug :) 10l, sorry :)
pontscho
parents: 4791
diff changeset
616 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
617
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
618 freeSwsContext(swsContext);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
619 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
620
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
621 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
622 {
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4734
diff changeset
623 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
624 {
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
625 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
626 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
627 }
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
628
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
629 #ifdef HAVE_NEW_GUI
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
630 if ( !use_gui )
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
631 #endif
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
632 if( !vo_init() ) return -1; // Can't open X11
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
633
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4734
diff changeset
634 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
635 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
636
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
637 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
638 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
639 switch (request) {
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
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
642 case VOCTRL_GUISUPPORT:
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
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);
4734
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
646 case VOCTRL_FULLSCREEN:
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4905
diff changeset
647 vo_x11_fullscreen();
4790
50288f9f6b15 Fix return value of VOCTRL_FULLSCREEN
atmos4
parents: 4780
diff changeset
648 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
649 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
650 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
651 }