annotate libvo/vo_xmga.c @ 4017:21a75ab24703

Xinerama patch number two by attila.
author atmos4
date Sun, 06 Jan 2002 21:07:20 +0000
parents 87538547c8f4
children a53d7ca1ed84
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
1
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
2 //#define SHOW_TIME
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 * video_out_xmga.c
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 * Copyright (C) Zoltan Ponekker - Jan 2001
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * mpeg2dec is free software; you can redistribute it and/or modify
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 * it under the terms of the GNU General Public License as published by
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 * the Free Software Foundation; either version 2, or (at your option)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 * any later version.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 * mpeg2dec is distributed in the hope that it will be useful,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 * GNU General Public License for more details.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 * You should have received a copy of the GNU General Public License
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 * along with GNU Make; see the file COPYING. If not, write to
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 LIBVO_EXTERN( xmga )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37 #include <sys/ioctl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 #include <unistd.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 #include <fcntl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 #include <sys/mman.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 #include "drivers/mga_vid.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
48 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
49 #include <X11/extensions/Xinerama.h>
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
50 #endif
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
51
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
52 #include "x11_common.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
53 #include "sub.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2039
diff changeset
54 #include "aspect.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
55
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
56 #ifdef SHOW_TIME
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
57 #include "../linux/timer.h"
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
58 static unsigned int timer=0;
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
59 static unsigned int timerd=0;
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
60 #endif
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
61
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 static vo_info_t vo_info =
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 "X11 (Matrox G200/G400 overlay in window using /dev/mga_vid)",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 "xmga",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 "Zoltan Ponekker <pontscho@makacs.poliod.hu>",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 ""
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
70 //static Display * mDisplay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 static Window mWindow;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 static GC mGC;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 static XGCValues wGCV;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 static XImage * myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 static uint32_t mDepth, bpp, mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 static uint32_t X_already_started=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static uint32_t wndHeight;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 static uint32_t wndWidth;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static uint32_t wndX;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static uint32_t wndY;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static uint32_t fgColor;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static uint32_t mvHeight;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static uint32_t mvWidth;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 static Window mRoot;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94
1783
beec84c3d830 fix gui support
pontscho
parents: 1723
diff changeset
95 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
96 static uint32_t mdwidth,mdheight;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
97 #endif
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
98
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 static XSetWindowAttributes xWAttribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 #include "mga_common.c"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103 static void mDrawColorKey( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105 XSetForeground( mDisplay,mGC,fgColor );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 XFillRectangle( mDisplay,mWindow,mGC,drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight) );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 XFlush( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
110 static void set_window(){
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
111
1783
beec84c3d830 fix gui support
pontscho
parents: 1723
diff changeset
112 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
113 if ( vo_window != None )
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
114 {
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
115 mFullscreen=0;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
116 dwidth=mdwidth; dheight=mdheight;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
117 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) )
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
118 {
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
119 mFullscreen=1;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
120 dwidth=vo_screenwidth;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
121 dheight=vo_screenwidth * mdheight / mdwidth;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
122 }
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
123 }
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
124 #endif
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
125
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
126 XGetGeometry( mDisplay,mWindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
127 drwX=0; drwY=0; // drwWidth=wndWidth; drwHeight=wndHeight;
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
128 XTranslateCoordinates( mDisplay,mWindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
129 fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
130
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
131 aspect(&dwidth,&dheight,A_NOZOOM);
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
132 if ( mFullscreen )
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
133 {
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
134 aspect(&dwidth,&dheight,A_ZOOM);
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
135 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
136 drwcX+=drwX;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
137 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
138 drwcY+=drwY;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
139 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
140 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
141 fprintf( stderr,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
142 }
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
143
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
144 mDrawColorKey();
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
145
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
146 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
147 if(XineramaIsActive(mDisplay))
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
148 {
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
149 XineramaScreenInfo *screens;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
150 int num_screens;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
151 int i;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
152
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
153 screens = XineramaQueryScreens(mDisplay,&num_screens);
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
154
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
155 /* find the screen we are on */
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
156 i = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
157 while(!(screens[i].x_org <= drwcX && screens[i].y_org <= drwcY &&
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
158 screens[i].x_org + screens[i].width >= drwcX &&
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
159 screens[i].y_org + screens[i].height >= drwcY ))
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
160 {
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
161 i++;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
162 }
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
163
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
164 /* set drwcX and drwcY to the right values */
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
165 drwcX = drwcX - screens[i].x_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
166 drwcY = drwcY - screens[i].y_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
167 XFree(screens);
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
168 }
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
169
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
170 #endif
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
171 mga_vid_config.x_org=drwcX;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
172 mga_vid_config.y_org=drwcY;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
173 mga_vid_config.dest_width=drwWidth;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
174 mga_vid_config.dest_height=drwHeight;
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
175
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
176 }
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
177
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
178 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179 {
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
180 int e=vo_x11_check_events(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
181
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
182 if(e&VO_EVENT_RESIZE){
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
183 set_window();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
184 if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 {
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
186 printf( "Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
187 // exit( 0 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188 }
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
189
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
190 } else
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
191 if(e&VO_EVENT_EXPOSE) mDrawColorKey();
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
192
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
193 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
194
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1210
diff changeset
195 static void draw_osd(void)
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1210
diff changeset
196 { vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);}
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1210
diff changeset
197
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
198 static void flip_page(void){
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
199 #ifdef SHOW_TIME
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
200 unsigned int t;
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
201 t=GetTimer();
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
202 printf(" [timer: %08X diff: %6d dd: %6d ] \n",t,t-timer,(t-timer)-timerd);
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
203 timerd=t-timer;
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
204 timer=t;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
205 #endif
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
206
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1210
diff changeset
207 vo_mga_flip_page();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
208 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
209
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210 static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212 char * frame_mem;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
213 // uint32_t frame_size;
927
2098be9cb19b mScreen removed -> segfault solved
arpi_esp
parents: 922
diff changeset
214 // int mScreen;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215 unsigned int fg, bg;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216 char * mTitle=(title == NULL) ? "XMGA render" : title;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 char * name=":0.0";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 XSizeHints hint;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219 XVisualInfo vinfo;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220 XEvent xev;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 XGCValues xgcv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 unsigned long xswamask;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224
1210
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
225 char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
226
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
227 f = open(devname,O_RDWR);
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
228 if(f == -1)
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
229 {
1637
248972c26eee fixed mga uninit
arpi
parents: 1501
diff changeset
230 perror("open");
1210
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
231 printf("Couldn't open %s\n",devname);
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
232 return(-1);
5cbbca64a5c9 vo_subdevice support
arpi_esp
parents: 1137
diff changeset
233 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 switch(format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
236 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
237 case IMGFMT_YV12:
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
238 mga_vid_config.format=MGA_VID_FORMAT_YV12;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
239 mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
240 break;
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
241 case IMGFMT_I420:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
242 mga_vid_config.format=MGA_VID_FORMAT_I420;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
243 mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
244 break;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
245 case IMGFMT_IYUV:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
246 mga_vid_config.format=MGA_VID_FORMAT_IYUV;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
247 mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 448
diff changeset
248 break;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
249 case IMGFMT_YUY2:
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
250 mga_vid_config.format=MGA_VID_FORMAT_YUY2;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
251 mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
252 break;
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 384
diff changeset
253 case IMGFMT_UYVY:
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 384
diff changeset
254 mga_vid_config.format=MGA_VID_FORMAT_UYVY;
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 384
diff changeset
255 mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 384
diff changeset
256 break;
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
257 default: printf("mga: invalid output format %0X\n",format); return (-1);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 if ( X_already_started ) return -1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
262 if (!vo_init()) return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
264 aspect_save_orig(width,height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
265 aspect_save_prescale(d_width,d_height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
266 aspect_save_screenres(vo_screenwidth,vo_screenheight);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
267
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 mvWidth=width; mvHeight=height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 wndX=0; wndY=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 wndWidth=d_width; wndHeight=d_height;
1783
beec84c3d830 fix gui support
pontscho
parents: 1723
diff changeset
272 #ifdef HAVE_NEW_GUI
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
273 // mdwidth=d_width; mdheight=d_height;
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
274 mdwidth=width; mdheight=height;
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
275 #endif
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
276 mFullscreen=fullscreen&1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
277
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
278 switch ( vo_depthonscreen )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
279 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
280 case 32:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
281 case 24: fgColor=0x00ff00ffL; break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
282 case 16: fgColor=0xf81fL; break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
283 case 15: fgColor=0x7c1fL; break;
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
284 default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
286
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
287 aspect(&d_width,&d_height,A_NOZOOM);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
288 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
289 if ( vo_window == None )
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
290 {
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
291 #endif
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
292 if ( mFullscreen )
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
293 {
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
294 wndWidth=vo_screenwidth;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
295 wndHeight=vo_screenheight;
2039
452f3cb96b32 Make aware of new -fs calling.
atmos4
parents: 1924
diff changeset
296 #ifdef X11_FULLSCREEN
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
297 aspect(&d_width,&d_height,A_ZOOM);
2039
452f3cb96b32 Make aware of new -fs calling.
atmos4
parents: 1924
diff changeset
298 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
299 }
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
300 dwidth=d_width; dheight=d_height;
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
301
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
302 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
303 mDepth=attribs.depth;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
304 if ( mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32 ) mDepth=24;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
305 XMatchVisualInfo( mDisplay,mScreen,mDepth,TrueColor,&vinfo );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
306 xWAttribs.colormap=XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),vinfo.visual,AllocNone );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
307 xWAttribs.background_pixel=0;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
308 xWAttribs.border_pixel=0;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
309 xWAttribs.event_mask=StructureNotifyMask | ExposureMask | KeyPressMask;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
310 xswamask=CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311
3847
c8c7ba08ef44 -wid/-rootwin support
arpi
parents: 3558
diff changeset
312 if ( WinID>=0 ){
c8c7ba08ef44 -wid/-rootwin support
arpi
parents: 3558
diff changeset
313 mWindow = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen);
c8c7ba08ef44 -wid/-rootwin support
arpi
parents: 3558
diff changeset
314 XUnmapWindow( mDisplay,mWindow );
c8c7ba08ef44 -wid/-rootwin support
arpi
parents: 3558
diff changeset
315 XChangeWindowAttributes( mDisplay,mWindow,xswamask,&xWAttribs);
c8c7ba08ef44 -wid/-rootwin support
arpi
parents: 3558
diff changeset
316 } else
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
317 mWindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
318 wndX,wndY,
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
319 wndWidth,wndHeight,
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
320 xWAttribs.border_pixel,
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
321 mDepth,
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
322 InputOutput,
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
323 vinfo.visual,xswamask,&xWAttribs );
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 927
diff changeset
324 vo_x11_classhint( mDisplay,mWindow,"xmga" );
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
325 vo_hidecursor(mDisplay,mWindow);
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
326
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
327 if ( mFullscreen ) vo_x11_decoration( mDisplay,mWindow,0 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
329 XGetNormalHints( mDisplay,mWindow,&hint );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
330 hint.x=wndX; hint.y=wndY;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
331 hint.width=wndWidth; hint.height=wndHeight;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
332 hint.base_width=wndWidth; hint.base_height=wndHeight;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
333 hint.flags=USPosition | USSize;
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
334 XSetNormalHints( mDisplay,mWindow,&hint );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
335 XStoreName( mDisplay,mWindow,mTitle );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
336 XMapWindow( mDisplay,mWindow );
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3847
diff changeset
337 #ifdef HAVE_XINERAMA
87538547c8f4 xinerama fix by attila
atmos4
parents: 3847
diff changeset
338 vo_x11_xinerama_move(mDisplay,mWindow);
87538547c8f4 xinerama fix by attila
atmos4
parents: 3847
diff changeset
339 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
340 mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
341 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
342 }
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
343 else
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
344 {
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
345 mWindow=vo_window;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
346 // fprintf( stderr,"[xmga] width: %d height: %d d_width: %d d_height: %d\n",width,height,d_width,d_height );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
347 // if ( vo_screenwidth != d_width )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
348 // {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
349 // XMoveWindow( mDisplay,mWindow,( vo_screenwidth - d_width ) / 2,( vo_screenheight - d_height ) / 2 );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
350 // XResizeWindow( mDisplay,mWindow,d_width,d_height );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
351 // }
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
352 // else mFullscreen=1;
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
353 mGC=vo_gc; //XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
354 }
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
355 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
356
120
93ea0c6aae7f common window setup code moved to set_window()
arpi_esp
parents: 100
diff changeset
357 set_window();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
358
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
359 mga_vid_config.src_width=width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360 mga_vid_config.src_height=height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
361
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
362 mga_vid_config.colkey_on=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
363 mga_vid_config.colkey_red=255;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
364 mga_vid_config.colkey_green=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
365 mga_vid_config.colkey_blue=255;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
367 if(mga_init()) return -1;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
368
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
369 set_window();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
371 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
372 if ( vo_window == None )
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
373 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
374 {
723
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
375 XFlush( mDisplay );
c3e0bdb64027 add gui support
pontscho
parents: 616
diff changeset
376 XSync( mDisplay,False );
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1637
diff changeset
377 }
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
378
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
379 #ifdef HAVE_NEW_GUI
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
380 if ( vo_window == None )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
381 #endif
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
382 saver_off(mDisplay);
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 213
diff changeset
383
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
384 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
385 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
386
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 static const vo_info_t* get_info( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388 { return &vo_info; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
389
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
393 {
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
394 #ifdef HAVE_NEW_GUI
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
395 if ( vo_window == None )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
396 #endif
1924
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
397 {
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1783
diff changeset
398 saver_on(mDisplay);
1924
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
399 XDestroyWindow( mDisplay,mWindow );
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
400 }
1637
248972c26eee fixed mga uninit
arpi
parents: 1501
diff changeset
401 mga_uninit();
248972c26eee fixed mga uninit
arpi
parents: 1501
diff changeset
402 printf("vo: uninit!\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
403 }