annotate libvo/vo_x11.c @ 3744:d358f4a74690

dvd seeking -> subtitle disappearing bugs fixed
author arpi
date Tue, 25 Dec 2001 20:32:02 +0000
parents 18cca6a6816c
children fc1db33734e7
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>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <signal.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 LIBVO_EXTERN( x11 )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <X11/Xutil.h>
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
30 //#include <X11/extensions/XShm.h>
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
31 #ifdef HAVE_XF86VM
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
32 #include <X11/extensions/xf86vmode.h>
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
33 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
36 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
37
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
38 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
39 #include "sub.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
40
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
41 #include "../postproc/swscale.h"
2556
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
42 #include "../postproc/rgb2rgb.h"
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
43
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 static vo_info_t vo_info =
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 "X11 ( XImage/Shm )",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 "x11",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 ""
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 /* private prototypes */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 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
54 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
55
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 /* since it doesn't seem to be defined on some platforms */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 int XShmGetEventBase( Display* );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 static unsigned char *ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
62 #ifdef HAVE_XF86VM
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
63 XF86VidModeModeInfo **vidmodes=NULL;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
64 #endif
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
65
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 /* X11 related variables */
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
67 //static Display *mDisplay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 static Window mywindow;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 static GC mygc;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 static XImage *myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 static int depth,bpp,mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73
3655
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
74 /* output window id */
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
75 int WinID=0;
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
76
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
77 //static int vo_dwidth,vo_dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
79 static int Flip_Flag;
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
80
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
81 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 //static int HandleXError _ANSI_ARGS_( ( Display * dpy,XErrorEvent * event ) );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static void InstallXErrorHandler ( void );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static void DeInstallXErrorHandler ( void );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 static int Shmem_Flag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static int Quiet_Flag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 static XShmSegmentInfo Shminfo[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94 static int gXErrorFlag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95 static int CompletionType=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 static void InstallXErrorHandler()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 //XSetErrorHandler( HandleXError );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 XFlush( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103 static void DeInstallXErrorHandler()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105 XSetErrorHandler( NULL );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 XFlush( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
113 static uint32_t image_format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
115 static void check_events(){
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
116 vo_x11_check_events(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
119 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
120 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
121 }
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 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
124 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
125 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
126
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
127 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
128 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
129 }
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 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
132 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
133 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
134
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
135 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
136 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
137
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
138 static unsigned int scale_srcW=0;
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
139 static unsigned int scale_srcH=0;
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
140
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
141
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
142 static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format )
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143 {
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
144 // int screen;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
145 int fullscreen=0;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
146 int vm=0;
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
147 // int interval, prefer_blank, allow_exp, nothing;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 unsigned int fg,bg;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 char *hello=( title == NULL ) ? "X11 render" : title;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
150 // char *name=":0.0";
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 XSizeHints hint;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 XVisualInfo vinfo;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 XEvent xev;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 XGCValues xgcv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 Colormap theCmap;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 XSetWindowAttributes xswa;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 unsigned long xswamask;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
158 unsigned int modeline_width, modeline_height;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 image_height=height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 image_width=width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162 image_format=format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
164 if( flags&0x03 ) fullscreen = 1;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
165 if( flags&0x02 ) vm = 1;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
166 if( flags&0x08 ) Flip_Flag = 1;
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
167
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
168 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
169
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
170 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
171 depth=attribs.depth;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
172
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
173 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
174 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
175
2234
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
176 if( flags&0x04 && format==IMGFMT_YV12 ) {
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
177 // software scale
2234
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
178 if(fullscreen){
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
179 image_width=vo_screenwidth;
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
180 image_height=vo_screenheight;
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
181 } else {
2274
9ee34c6950e0 xinc scaled by 16 instead of 8
arpi
parents: 2234
diff changeset
182 image_width=d_width&(~7);
2234
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
183 image_height=d_height;
36fa77e785d4 swscale - 16bpp and -fs support
arpi
parents: 2218
diff changeset
184 }
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
185 scale_srcW=width;
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
186 scale_srcH=height;
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
187 SwScale_Init();
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
188 }
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
189
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
190 #ifdef HAVE_NEW_GUI
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
191 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; }
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
192 else
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
193 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
194 {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
195 if( !vo_init() ) return 0; // Can't open X11
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
196
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
197 hint.x=0;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
198 hint.y=0;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
199 hint.width=image_width;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
200 hint.height=image_height;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
201
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
202
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
203 #ifdef HAVE_XF86VM
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
204 if (vm) {
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
205 unsigned int vm_event, vm_error;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
206 unsigned int vm_ver, vm_rev;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
207 int i,j,have_vm=0,X,Y;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
208
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
209 int modecount;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
210
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
211 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
212 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
213 printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev);
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
214 have_vm=1;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
215 } else
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
216 printf("XF86VidMode Extenstion not available.\n");
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
217
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
218 if (have_vm) {
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
219 if (vidmodes==NULL)
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
220 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
221 j=0;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
222 modeline_width=vidmodes[0]->hdisplay;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
223 modeline_height=vidmodes[0]->vdisplay;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
224 if ((d_width==0) && (d_height==0))
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
225 { X=image_width; Y=image_height; }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
226 else
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
227 { X=d_width; Y=d_height; }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
228
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
229 for (i=1; i<modecount; i++)
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
230 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y))
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
231 if ( (vidmodes[i]->hdisplay < modeline_width ) && (vidmodes[i]->vdisplay < modeline_height) )
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
232 {
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
233 modeline_width=vidmodes[i]->hdisplay;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
234 modeline_height=vidmodes[i]->vdisplay;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
235 j=i;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
236 }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
237
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
238 printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",modeline_width, modeline_height, image_width, image_height);
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
239 XF86VidModeLockModeSwitch(mDisplay,mScreen,0);
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
240 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
241 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
242 X=(vo_screenwidth-modeline_width)/2;
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
243 Y=(vo_screenheight-modeline_height)/2;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
244 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y);
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
245 }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
246 }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
247 #endif
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
248
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
249 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
250 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
251 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
252 hint.x=(vo_screenwidth-modeline_width)/2;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
253 hint.y=(vo_screenheight-modeline_height)/2;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
254 hint.width=modeline_width;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
255 hint.height=modeline_height;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
256 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
257 else
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
258 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
259 if ( fullscreen )
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
260 {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
261 hint.width=vo_screenwidth;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
262 hint.height=vo_screenheight;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
263 }
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
264 hint.flags=PPosition | PSize;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
266 bg=WhitePixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
267 fg=BlackPixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
268 vo_dwidth=hint.width;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
269 vo_dheight=hint.height;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
271 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
272 vinfo.visual,AllocNone );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
274 xswa.background_pixel=0;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
275 xswa.border_pixel=0;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
276 xswa.colormap=theCmap;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
277 xswamask=CWBackPixel | CWBorderPixel | CWColormap;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
278
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
279 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
280 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
281 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
282 xswa.override_redirect=True;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
283 xswamask|=CWOverrideRedirect;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
284 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
285 #endif
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
286
3655
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
287 if ( WinID ){
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
288 mywindow = (Window)WinID;
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
289 XUnmapWindow( mDisplay,mywindow );
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
290 XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa );
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
291 }
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
292 else
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
293 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294 hint.x,hint.y,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
295 hint.width,hint.height,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
296 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
297
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
298 vo_x11_classhint( mDisplay,mywindow,"x11" );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
299 vo_hidecursor(mDisplay,mywindow);
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
300 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
301 XSelectInput( mDisplay,mywindow,StructureNotifyMask );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
302 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
303 XMapWindow( mDisplay,mywindow );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
304 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
305 XSelectInput( mDisplay,mywindow,NoEventMask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
307 XFlush( mDisplay );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
308 XSync( mDisplay,False );
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
309 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
311 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
312 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
313 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
314 /* Grab the mouse pointer in our window */
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
315 XGrabPointer(mDisplay, mywindow, True, 0,
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
316 GrabModeAsync, GrabModeAsync,
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
317 mywindow, None, CurrentTime);
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
318 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime);
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
319 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
320 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
321 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
323 #ifdef HAVE_SHM
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 865
diff changeset
324 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 Shmem_Flag=0;
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
328 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 InstallXErrorHandler();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334 if ( Shmem_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
335 {
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
336 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],image_width,image_height );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
337 if ( myximage == NULL )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
339 if ( myximage != NULL ) XDestroyImage( myximage );
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
340 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
341 goto shmemerror;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
343 Shminfo[0].shmid=shmget( IPC_PRIVATE,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
344 myximage->bytes_per_line * myximage->height ,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 IPC_CREAT | 0777 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
346 if ( Shminfo[0].shmid < 0 )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
347 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
348 XDestroyImage( myximage );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
349 if ( !Quiet_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
351 printf( "%s\n",strerror( errno ) );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
352 perror( strerror( errno ) );
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
353 printf( "Shared memory error,disabling ( seg id error )\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 goto shmemerror;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
356 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
357 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
358
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
359 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
361 XDestroyImage( myximage );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
362 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr );
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
363 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
364 goto shmemerror;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
365 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366 myximage->data=Shminfo[0].shmaddr;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
367 ImageData=( unsigned char * ) myximage->data;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368 Shminfo[0].readOnly=False;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369 XShmAttach( mDisplay,&Shminfo[0] );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
371 XSync( mDisplay,False );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 if ( gXErrorFlag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
375 XDestroyImage( myximage );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
376 shmdt( Shminfo[0].shmaddr );
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
377 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
378 gXErrorFlag=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
379 goto shmemerror;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
380 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382 shmctl( Shminfo[0].shmid,IPC_RMID,0 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
383
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
384 if ( !Quiet_Flag ) printf( "Sharing memory.\n" );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
385 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
386 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388 shmemerror:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
389 Shmem_Flag=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391 myximage=XGetImage( mDisplay,mywindow,0,0,
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
392 image_width,image_height,AllPlanes,ZPixmap );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
393 ImageData=myximage->data;
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
394 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
395 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
396
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
397 DeInstallXErrorHandler();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
398 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
399
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
400 switch ((bpp=myximage->bits_per_pixel)){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
401 case 24: draw_alpha_fnc=draw_alpha_24; break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
402 case 32: draw_alpha_fnc=draw_alpha_32; break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
403 case 15:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
404 case 16: if (depth==15)
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
405 draw_alpha_fnc=draw_alpha_15;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
406 else
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
407 draw_alpha_fnc=draw_alpha_16;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
408 break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
409 default: draw_alpha_fnc=draw_alpha_null;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
410 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
411
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
412 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
413
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
414 // If we have blue in the lowest bit then obviously RGB
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
415 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 #ifdef WORDS_BIGENDIAN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417 if ( myximage->byte_order != MSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
418 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
419 if ( myximage->byte_order != LSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
420 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
421 {
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
422 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
423 // printf( "No support fon non-native XImage byte order!\n" );
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
424 // return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
425 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
426
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
427 if( format==IMGFMT_YV12 ) yuv2rgb_init( ( depth == 24 ) ? bpp : depth,mode );
1758
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
428
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
429 #ifdef HAVE_NEW_GUI
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
430 if ( vo_window == None )
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
431 #endif
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
432 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
433 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
434 saver_off(mDisplay);
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
435 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
436 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
437 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
438
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
439 static const vo_info_t* get_info( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
440 { return &vo_info; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
441
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
442 static void Terminate_Display_Process( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
443 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
444 getchar(); /* wait for enter to remove window */
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
445 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446 if ( Shmem_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448 XShmDetach( mDisplay,&Shminfo[0] );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
449 XDestroyImage( myximage );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450 shmdt( Shminfo[0].shmaddr );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
452 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
453 XDestroyWindow( mDisplay,mywindow );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
454 XCloseDisplay( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
455 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
456
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
457 static void Display_Image( XImage *myximage,uint8_t *ImageData )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
458 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
459 #ifdef DISP
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
460 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
461 if ( Shmem_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
462 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
463 XShmPutImage( mDisplay,mywindow,mygc,myximage,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464 0,0,
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
465 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
466 myximage->width,myximage->height,True );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
467 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
469 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
470 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
471 XPutImage( mDisplay,mywindow,mygc,myximage,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
472 0,0,
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
473 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
474 myximage->width,myximage->height );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
475 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
476 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
477 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
478
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
479 static void draw_osd(void)
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
480 { 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
481
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
482 static void flip_page( void ){
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
483 Display_Image( myximage,ImageData );
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
484 XSync(mDisplay, False);
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
485 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
486
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487 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
488 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
489
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
490 if(scale_srcW){
2519
6f3fa9bc3b27 yv12 to yv12 scaler
michael
parents: 2325
diff changeset
491 uint8_t *dst[3] = {ImageData, NULL, NULL};
6f3fa9bc3b27 yv12 to yv12 scaler
michael
parents: 2325
diff changeset
492 SwScale_YV12slice(src,stride,y,h,
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
493 dst, image_width*((bpp+7)/8), ( depth == 24 ) ? bpp : depth,
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
494 scale_srcW, scale_srcH, image_width, image_height);
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
495 } else {
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
496 uint8_t *dst=ImageData + ( image_width * y + x ) * ( bpp/8 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
497 yuv2rgb( dst,src[0],src[1],src[2],w,h,image_width*( bpp/8 ),stride[0],stride[1] );
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
498 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
499 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
500 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
502 static uint32_t draw_frame( uint8_t *src[] ){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
503 int sbpp=( ( image_format&0xFF )+7 )/8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
504 int dbpp=( bpp+7 )/8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
505 char *d=ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506 char *s=src[0];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
507 //printf( "sbpp=%d dbpp=%d depth=%d bpp=%d\n",sbpp,dbpp,depth,bpp );
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
508
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
509 if( Flip_Flag ){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
510 // flipped BGR
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
511 int i;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
512 //printf( "Rendering flipped BGR frame bpp=%d src=%d dst=%d\n",bpp,sbpp,dbpp );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
513 s+=sbpp*image_width*image_height;
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
514 for( i=0;i<image_height;i++ ) {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515 s-=sbpp*image_width;
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
516 if( sbpp==dbpp ) {
2556
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
517 if( depth==16 && image_format==( IMGFMT_BGR|15 ) )
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
518 rgb15to16(s,d,2*image_width );
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
519 else
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
520 memcpy( d,s,sbpp*image_width );
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
521 } else {
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
522 // sbpp!=dbpp
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
523 char *s2=s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
524 char *d2=d;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
525 char *e=s2+sbpp*image_width;
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
526 while( s2<e ) {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
527 d2[0]=s2[0];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
528 d2[1]=s2[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
529 d2[2]=s2[2];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
530 s2+=sbpp;d2+=dbpp;
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
531 }
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
532 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
533 d+=dbpp*image_width;
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
534 }
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
535 } else {
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
536 if( sbpp==dbpp ) {
2556
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
537 if( depth==16 && image_format==( IMGFMT_BGR|15 ) )
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
538 rgb15to16( s,d,2*image_width*image_height );
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
539 else
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
540 memcpy( d,s,sbpp*image_width*image_height );
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
541 } else {
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
542 // sbpp!=dbpp
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
543 char *e=s+sbpp*image_width*image_height;
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
544 //printf( "libvo: using C 24->32bpp conversion\n" );
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
545 while( s<e ){
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
546 d[0]=s[0];
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
547 d[1]=s[1];
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
548 d[2]=s[2];
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
549 s+=sbpp;d+=dbpp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
550 }
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
551 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
552 }
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
553 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
554 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
555
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
556 static uint32_t query_format( uint32_t format )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
557 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
558 if( !vo_init() ) return 0; // Can't open X11
325
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
559
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
560 if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR ){
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
561 int bpp=format&0xFF;
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
562 if( bpp==vo_depthonscreen ) return 1;
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
563 if( bpp==15 && vo_depthonscreen==16) return 1; // built-in conversion
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
564 if( bpp==24 && vo_depthonscreen==32) return 1; // built-in conversion
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
565 }
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
566
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
567 switch( format )
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
568 {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
569 case IMGFMT_YV12: return 1;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
570 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
571 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
572 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
573
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
574
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
575 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577 {
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
578 #ifdef HAVE_NEW_GUI
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
579 if ( vo_window == None )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
580 #endif
1924
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
581 {
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
582 saver_on(mDisplay); // screen saver back on
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
583 XDestroyWindow( mDisplay,mywindow );
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
584 }
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
585 #ifdef HAVE_XF86VM
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
586 #ifdef HAVE_NEW_GUI
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
587 if ((vidmodes!=NULL)&&( vo_window == None ) )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
588 #else
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
589 if (vidmodes!=NULL)
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
590 #endif
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
591 {
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
592 int screen; screen=DefaultScreen( mDisplay );
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
593 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]);
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
594 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]);
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
595 free(vidmodes);
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
596 }
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
597 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
598 printf("vo: uninit!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 }
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