Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 6064:55b2b5da9bd2
small cleanup, new flag in -fsmode to avoid unmapping window for unknown wm
author | arpi |
---|---|
date | Sun, 12 May 2002 22:16:31 +0000 |
parents | c0ae8c0eda72 |
children | 754c2af16815 |
rev | line source |
---|---|
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1 |
32 | 2 #include <stdio.h> |
3 #include <stdlib.h> | |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
4 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
5 #include "config.h" |
5998 | 6 #include "mp_msg.h" |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
7 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
8 #ifdef X11_FULLSCREEN |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
9 |
440
d19a3da6ac13
Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;)
gabucino
parents:
416
diff
changeset
|
10 #include <string.h> |
32 | 11 #include <unistd.h> |
12 #include <sys/mman.h> | |
13 | |
14 #include "video_out.h" | |
15 | |
324 | 16 #include <X11/Xmd.h> |
32 | 17 #include <X11/Xlib.h> |
18 #include <X11/Xutil.h> | |
19 #include <X11/Xatom.h> | |
20 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
21 #ifdef HAVE_XDPMS |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
22 #include <X11/extensions/dpms.h> |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
23 #endif |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
24 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
25 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
26 #include <X11/extensions/Xinerama.h> |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
27 #endif |
1732 | 28 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
29 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
30 #include <X11/extensions/xf86vmode.h> |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
31 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
32 |
4658 | 33 #ifdef HAVE_NEW_INPUT |
34 #include "../input/input.h" | |
35 #include "../input/mouse.h" | |
36 #endif | |
37 | |
4798 | 38 #ifdef HAVE_NEW_GUI |
39 #include "../Gui/interface.h" | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
40 #include "../mplayer.h" |
4798 | 41 #endif |
42 | |
1732 | 43 /* |
44 * If SCAN_VISUALS is defined, vo_init() scans all available TrueColor | |
45 * visuals for the 'best' visual for MPlayer video display. Note that | |
46 * the 'best' visual might be different from the default visual that | |
47 * is in use on the root window of the display/screen. | |
48 */ | |
49 #define SCAN_VISUALS | |
50 | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
51 #define vo_wm_Unknown 0 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
52 #define vo_wm_NetWM 1 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
53 #define vo_wm_KDE 2 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
54 #define vo_wm_IceWM 3 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
55 #define vo_wm_WMakerStyle 4 |
1732 | 56 |
4812 | 57 extern int verbose; |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1447
diff
changeset
|
58 |
324 | 59 static int dpms_disabled=0; |
60 static int timeout_save=0; | |
61 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
62 char* mDisplayName=NULL; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
63 Display* mDisplay; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
64 Window mRootWin; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
65 int mScreen; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
66 int mLocalDisplay; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
67 |
3830 | 68 /* output window id */ |
69 int WinID=-1; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
70 int vo_mouse_autohide = 0; |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
71 int vo_wm_type = vo_wm_Unknown; |
384 | 72 |
4017 | 73 #ifdef HAVE_XINERAMA |
74 int xinerama_screen = 0; | |
75 int xinerama_x = 0; | |
76 int xinerama_y = 0; | |
77 #endif | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
78 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
79 XF86VidModeModeInfo **vidmodes=NULL; |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
80 XF86VidModeModeLine modeline; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
81 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
82 |
384 | 83 void vo_hidecursor ( Display *disp , Window win ) |
84 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
85 Cursor no_ptr; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
86 Pixmap bm_no; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
87 XColor black,dummy; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
88 Colormap colormap; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
89 static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 }; |
3954 | 90 |
91 if(WinID==0) return; // do not hide, if we're playing at rootwin | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
92 |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
93 colormap = DefaultColormap(disp,DefaultScreen(disp)); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
94 XAllocNamedColor(disp,colormap,"black",&black,&dummy); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
95 bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8,8); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
96 no_ptr=XCreatePixmapCursor(disp, bm_no, bm_no,&black, &black,0, 0); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
97 XDefineCursor(disp,win,no_ptr); |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
98 XFreeCursor( disp,no_ptr ); |
384 | 99 } |
100 | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
101 void vo_showcursor( Display *disp, Window win ) |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
102 { |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
103 if ( WinID==0 ) return; |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
104 XDefineCursor( disp,win,0 ); |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
105 } |
384 | 106 |
1732 | 107 #ifdef SCAN_VISUALS |
108 /* | |
109 * Scan the available visuals on this Display/Screen. Try to find | |
110 * the 'best' available TrueColor visual that has a decent color | |
111 * depth (at least 15bit). If there are multiple visuals with depth | |
112 * >= 15bit, we prefer visuals with a smaller color depth. | |
113 */ | |
114 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return) | |
115 { | |
116 XVisualInfo visual_tmpl; | |
117 XVisualInfo *visuals; | |
118 int nvisuals, i; | |
119 int bestvisual = -1; | |
120 int bestvisual_depth = -1; | |
121 | |
122 visual_tmpl.screen = screen; | |
123 visual_tmpl.class = TrueColor; | |
124 visuals = XGetVisualInfo(dpy, | |
125 VisualScreenMask | VisualClassMask, &visual_tmpl, | |
126 &nvisuals); | |
127 if (visuals != NULL) { | |
128 for (i = 0; i < nvisuals; i++) { | |
129 if (verbose) | |
130 printf("vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n", | |
131 visuals[i].visualid, visuals[i].depth, | |
132 visuals[i].red_mask, visuals[i].green_mask, | |
133 visuals[i].blue_mask); | |
134 /* | |
135 * save the visual index and it's depth, if this is the first | |
136 * truecolor visul, or a visual that is 'preferred' over the | |
137 * previous 'best' visual | |
138 */ | |
139 if (bestvisual_depth == -1 | |
140 || (visuals[i].depth >= 15 | |
141 && ( visuals[i].depth < bestvisual_depth | |
142 || bestvisual_depth < 15))) { | |
143 bestvisual = i; | |
144 bestvisual_depth = visuals[i].depth; | |
145 } | |
146 } | |
147 | |
148 if (bestvisual != -1 && visual_return != NULL) | |
149 *visual_return = visuals[bestvisual].visual; | |
150 | |
151 XFree(visuals); | |
152 } | |
153 return bestvisual_depth; | |
154 } | |
155 #endif | |
156 | |
4742 | 157 static void x11_errorhandler(Display *display, XErrorEvent *event) |
158 { | |
159 #define MSGLEN 60 | |
160 char msg[MSGLEN]; | |
161 | |
4812 | 162 XGetErrorText(display, event->error_code, (char *)&msg, MSGLEN); |
4742 | 163 |
164 printf("X11 error: %s\n", msg); | |
165 | |
166 if (verbose) | |
167 { | |
168 printf("Type: %x, display: %x, resourceid: %x, serial: %x\n", | |
169 event->type, event->display, event->resourceid, event->serial); | |
170 printf("Error code: %x, request code: %x, minor code: %x\n", | |
171 event->error_code, event->request_code, event->minor_code); | |
172 } | |
173 | |
174 exit_player("X11 error"); | |
175 #undef MSGLEN | |
176 } | |
1732 | 177 |
6046 | 178 int vo_wm_string_test( char * name ) |
179 { | |
180 if ( !strncmp( name,"_ICEWM_TRAY",11 ) ) | |
181 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" ); return vo_wm_IceWM; } | |
182 if ( !strncmp( name,"_KDE_",5 ) ) | |
183 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); return vo_wm_KDE; } | |
184 if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) | |
185 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); return vo_wm_WMakerStyle; } | |
186 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",win,name,xev.xproperty.atom ); | |
187 return vo_wm_Unknown; | |
188 } | |
189 | |
6009 | 190 int vo_wm_detect( void ) |
191 { | |
192 Atom type; | |
193 Window win; | |
194 XEvent xev; | |
195 int c = 0; | |
196 int wm = vo_wm_Unknown; | |
197 int format; | |
198 unsigned long nitems, bytesafter; | |
199 unsigned char * args = NULL; | |
6043 | 200 char * name = NULL; |
201 | |
202 if ( WinID >= 0 ) return vo_wm_Unknown; | |
203 | |
6009 | 204 #if 1 |
205 // --- netwm | |
206 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); | |
207 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) | |
208 { | |
6043 | 209 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" ); |
6009 | 210 XFree( args ); |
211 return vo_wm_NetWM; | |
212 } | |
213 #endif | |
214 // --- other wm | |
215 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Create window for WM detect ...\n" ); | |
216 win=XCreateSimpleWindow( mDisplay,mRootWin,vo_screenwidth,vo_screenheight,1,1,0,0,0 ); | |
217 XSelectInput( mDisplay,win,PropertyChangeMask | StructureNotifyMask ); | |
218 XMapWindow( mDisplay,win ); | |
219 XMoveWindow( mDisplay,win,vo_screenwidth,vo_screenheight ); | |
220 do | |
221 { | |
222 XCheckWindowEvent( mDisplay,win,PropertyChangeMask | StructureNotifyMask,&xev ); | |
223 | |
224 if ( xev.type == PropertyNotify ) | |
225 { | |
6043 | 226 name=XGetAtomName( mDisplay,xev.xproperty.atom ); |
6009 | 227 if ( !name ) break; |
228 | |
6046 | 229 wm=vo_wm_string_test( name ); |
230 if ( wm != vo_wm_Unknown ) break; | |
6043 | 231 XFree( name ); name=NULL; |
6009 | 232 } |
233 } while( c++ < 25 ); | |
6043 | 234 if ( name ) XFree( name ); |
6009 | 235 XDestroyWindow( mDisplay,win ); |
236 #ifdef MP_DEBUG | |
237 if ( wm == vo_wm_Unknown ) mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Unknown wm type...\n" ); | |
238 #endif | |
239 return wm; | |
240 } | |
241 | |
32 | 242 int vo_init( void ) |
243 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
244 // int mScreen; |
1732 | 245 int depth, bpp; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
246 unsigned int mask; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
247 // char * DisplayName = ":0.0"; |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
248 // Display * mDisplay; |
1732 | 249 XImage * mXImage = NULL; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
250 // Window mRootWin; |
1732 | 251 XWindowAttributes attribs; |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
252 char* dispName; |
32 | 253 |
254 if(vo_depthonscreen) return 1; // already called | |
255 | |
4812 | 256 XSetErrorHandler(x11_errorhandler); |
257 | |
258 #if 0 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
259 if (!mDisplayName) |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
260 if (!(mDisplayName=getenv("DISPLAY"))) |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
261 mDisplayName=strdup(":0.0"); |
4812 | 262 #else |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
263 dispName = XDisplayName(mDisplayName); |
4812 | 264 #endif |
265 | |
266 if (verbose) | |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
267 printf("X11 opening display: %s\n", dispName); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
268 |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
269 mDisplay=XOpenDisplay(dispName); |
32 | 270 if ( !mDisplay ) |
271 { | |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
272 printf( "vo: couldn't open the X11 display (%s)!\n",dispName ); |
32 | 273 return 0; |
274 } | |
275 mScreen=DefaultScreen( mDisplay ); // Screen ID. | |
276 mRootWin=RootWindow( mDisplay,mScreen );// Root window ID. | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
277 |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
278 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
279 if(XineramaIsActive(mDisplay)) |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
280 { |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
281 XineramaScreenInfo *screens; |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
282 int num_screens; |
3990 | 283 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
284 screens = XineramaQueryScreens(mDisplay, &num_screens); |
4017 | 285 if(xinerama_screen >= num_screens) xinerama_screen = 0; |
3461
6b4ff1eb79bf
xinerama: allow to override xinerama screen_w/screen_h and setting size of screen where the window is placed
alex
parents:
2364
diff
changeset
|
286 if (! vo_screenwidth) |
4017 | 287 vo_screenwidth=screens[xinerama_screen].width; |
3461
6b4ff1eb79bf
xinerama: allow to override xinerama screen_w/screen_h and setting size of screen where the window is placed
alex
parents:
2364
diff
changeset
|
288 if (! vo_screenheight) |
4017 | 289 vo_screenheight=screens[xinerama_screen].height; |
290 xinerama_x = screens[xinerama_screen].x_org; | |
291 xinerama_y = screens[xinerama_screen].y_org; | |
292 | |
3990 | 293 XFree(screens); |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
294 } |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
295 else |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
296 #endif |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
297 #ifdef HAVE_XF86VM |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
298 { |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
299 int clock; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
300 XF86VidModeGetModeLine( mDisplay,mScreen,&clock ,&modeline ); |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
301 if ( !vo_screenwidth ) vo_screenwidth=modeline.hdisplay; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
302 if ( !vo_screenheight ) vo_screenheight=modeline.vdisplay; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
303 } |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
304 #endif |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
305 { |
2364 | 306 if (! vo_screenwidth) |
307 vo_screenwidth=DisplayWidth( mDisplay,mScreen ); | |
308 if (! vo_screenheight) | |
309 vo_screenheight=DisplayHeight( mDisplay,mScreen ); | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
310 } |
1732 | 311 // get color depth (from root window, or the best visual): |
32 | 312 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
1732 | 313 depth=attribs.depth; |
314 | |
315 #ifdef SCAN_VISUALS | |
316 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) { | |
317 Visual *visual; | |
318 | |
319 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); | |
320 if (depth != -1) | |
321 mXImage=XCreateImage(mDisplay, visual, depth, ZPixmap, | |
322 0, NULL, 1, 1, 8, 1); | |
323 } else | |
324 #endif | |
325 mXImage=XGetImage( mDisplay,mRootWin,0,0,1,1,AllPlanes,ZPixmap ); | |
326 | |
327 vo_depthonscreen = depth; // display depth on screen | |
328 | |
329 // get bits/pixel from XImage structure: | |
330 if (mXImage == NULL) { | |
331 mask = 0; | |
332 } else { | |
333 /* | |
334 * for the depth==24 case, the XImage structures might use | |
335 * 24 or 32 bits of data per pixel. The global variable | |
336 * vo_depthonscreen stores the amount of data per pixel in the | |
337 * XImage structure! | |
338 * | |
339 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp? | |
340 */ | |
32 | 341 bpp=mXImage->bits_per_pixel; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
342 if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
343 mask=mXImage->red_mask|mXImage->green_mask|mXImage->blue_mask; |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1447
diff
changeset
|
344 if(verbose) |
1732 | 345 printf("vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", |
346 mask,mXImage->red_mask,mXImage->green_mask,mXImage->blue_mask); | |
4181 | 347 XDestroyImage( mXImage ); |
1732 | 348 } |
349 if(((vo_depthonscreen+7)/8)==2){ | |
350 if(mask==0x7FFF) vo_depthonscreen=15; else | |
351 if(mask==0xFFFF) vo_depthonscreen=16; | |
352 } | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
353 // XCloseDisplay( mDisplay ); |
1447
e82fbd67ae60
better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents:
1415
diff
changeset
|
354 /* slightly improved local display detection AST */ |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
355 if ( strncmp(dispName, "unix:", 5) == 0) |
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
356 dispName += 4; |
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
357 else if ( strncmp(dispName, "localhost:", 10) == 0) |
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
358 dispName += 9; |
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
359 if (*dispName==':') mLocalDisplay=1; else mLocalDisplay=0; |
1732 | 360 printf("vo: X11 running at %dx%d with depth %d and %d bits/pixel (\"%s\" => %s display)\n", |
361 vo_screenwidth,vo_screenheight, | |
362 depth, vo_depthonscreen, | |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
363 dispName,mLocalDisplay?"local":"remote"); |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
364 |
6009 | 365 vo_wm_type=vo_wm_detect(); |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
366 |
32 | 367 return 1; |
368 } | |
369 | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
370 void vo_uninit( void ) |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
371 { |
6016 | 372 if( !vo_depthonscreen ) return; |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
373 printf("vo: uninit ...\n" ); |
6016 | 374 XSetErrorHandler(NULL); |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
375 XCloseDisplay( mDisplay ); |
6016 | 376 vo_depthonscreen = 0; |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
377 } |
4436 | 378 |
32 | 379 #include "../linux/keycodes.h" |
380 #include "wskeys.h" | |
381 | |
382 extern void mplayer_put_key(int code); | |
383 | |
384 void vo_x11_putkey(int key){ | |
385 switch ( key ) | |
386 { | |
387 case wsLeft: mplayer_put_key(KEY_LEFT); break; | |
388 case wsRight: mplayer_put_key(KEY_RIGHT); break; | |
389 case wsUp: mplayer_put_key(KEY_UP); break; | |
390 case wsDown: mplayer_put_key(KEY_DOWN); break; | |
391 case wsSpace: mplayer_put_key(' '); break; | |
392 case wsEscape: mplayer_put_key(KEY_ESC); break; | |
393 case wsEnter: mplayer_put_key(KEY_ENTER); break; | |
651 | 394 case wsPageUp: mplayer_put_key(KEY_PAGE_UP); break; |
395 case wsPageDown: mplayer_put_key(KEY_PAGE_DOWN); break; | |
32 | 396 case wsq: |
397 case wsQ: mplayer_put_key('q'); break; | |
398 case wsp: | |
399 case wsP: mplayer_put_key('p'); break; | |
400 case wsMinus: | |
401 case wsGrayMinus: mplayer_put_key('-'); break; | |
402 case wsPlus: | |
403 case wsGrayPlus: mplayer_put_key('+'); break; | |
464 | 404 case wsGrayMul: |
405 case wsMul: mplayer_put_key('*'); break; | |
406 case wsGrayDiv: | |
407 case wsDiv: mplayer_put_key('/'); break; | |
3490 | 408 case wsLess: mplayer_put_key('<'); break; |
409 case wsMore: mplayer_put_key('>'); break; | |
516 | 410 case wsm: |
411 case wsM: mplayer_put_key('m'); break; | |
655 | 412 case wso: |
413 case wsO: mplayer_put_key('o'); break; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1456
diff
changeset
|
414 default: if((key>='a' && key<='z')||(key>='A' && key<='Z')|| |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1456
diff
changeset
|
415 (key>='0' && key<='9')) mplayer_put_key(key); |
32 | 416 } |
369 | 417 |
32 | 418 } |
419 | |
420 | |
421 // ----- Motif header: ------- | |
422 | |
1236 | 423 #define MWM_HINTS_FUNCTIONS (1L << 0) |
424 #define MWM_HINTS_DECORATIONS (1L << 1) | |
425 #define MWM_HINTS_INPUT_MODE (1L << 2) | |
426 #define MWM_HINTS_STATUS (1L << 3) | |
427 | |
428 #define MWM_FUNC_ALL (1L << 0) | |
429 #define MWM_FUNC_RESIZE (1L << 1) | |
430 #define MWM_FUNC_MOVE (1L << 2) | |
431 #define MWM_FUNC_MINIMIZE (1L << 3) | |
432 #define MWM_FUNC_MAXIMIZE (1L << 4) | |
433 #define MWM_FUNC_CLOSE (1L << 5) | |
434 | |
435 #define MWM_DECOR_ALL (1L << 0) | |
436 #define MWM_DECOR_BORDER (1L << 1) | |
437 #define MWM_DECOR_RESIZEH (1L << 2) | |
438 #define MWM_DECOR_TITLE (1L << 3) | |
439 #define MWM_DECOR_MENU (1L << 4) | |
440 #define MWM_DECOR_MINIMIZE (1L << 5) | |
441 #define MWM_DECOR_MAXIMIZE (1L << 6) | |
442 | |
443 #define MWM_INPUT_MODELESS 0 | |
444 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 | |
445 #define MWM_INPUT_SYSTEM_MODAL 2 | |
446 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 | |
447 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL | |
448 | |
449 #define MWM_TEAROFF_WINDOW (1L<<0) | |
32 | 450 |
451 typedef struct | |
452 { | |
453 long flags; | |
454 long functions; | |
455 long decorations; | |
456 long input_mode; | |
1236 | 457 long state; |
32 | 458 } MotifWmHints; |
459 | |
460 extern MotifWmHints vo_MotifWmHints; | |
461 extern Atom vo_MotifHints; | |
462 extern int vo_depthonscreen; | |
463 extern int vo_screenwidth; | |
464 extern int vo_screenheight; | |
465 | |
466 static MotifWmHints vo_MotifWmHints; | |
467 static Atom vo_MotifHints = None; | |
468 | |
1266 | 469 // Note: always d==0 ! |
32 | 470 void vo_x11_decoration( Display * vo_Display,Window w,int d ) |
471 { | |
1266 | 472 |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
473 if ( !WinID ) return; |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
474 |
1266 | 475 if(vo_fsmode&1){ |
476 XSetWindowAttributes attr; | |
5981 | 477 attr.override_redirect = (!d) ? True : False; |
1266 | 478 XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr); |
4437 | 479 // XMapWindow(vo_Display, w); |
1266 | 480 } |
481 | |
1415 | 482 if(vo_fsmode&8){ |
483 XSetTransientForHint (vo_Display, w, RootWindow(vo_Display,mScreen)); | |
484 } | |
485 | |
32 | 486 vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 ); |
487 if ( vo_MotifHints != None ) | |
488 { | |
1236 | 489 memset( &vo_MotifWmHints,0,sizeof( MotifWmHints ) ); |
490 vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; | |
4993 | 491 if ( d ) |
492 { | |
6059 | 493 vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; |
4993 | 494 d=MWM_DECOR_ALL; |
495 } | |
496 #if 0 | |
1266 | 497 vo_MotifWmHints.decorations=d|((vo_fsmode&2)?0:MWM_DECOR_MENU); |
4993 | 498 #else |
499 vo_MotifWmHints.decorations=d|((vo_fsmode&2)?MWM_DECOR_MENU:0); | |
500 #endif | |
32 | 501 XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32, |
1266 | 502 PropModeReplace,(unsigned char *)&vo_MotifWmHints,(vo_fsmode&4)?4:5 ); |
32 | 503 } |
504 } | |
505 | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
506 void vo_x11_classhint( Display * display,Window window,char *name ){ |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
507 XClassHint wmClass; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
508 wmClass.res_name = name; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
509 wmClass.res_class = "MPlayer"; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
510 XSetClassHint(display,window,&wmClass); |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
511 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
512 |
4993 | 513 Window vo_window = None; |
514 GC vo_gc; | |
515 XSizeHints vo_hint; | |
4795 | 516 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
517 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
518 void vo_setwindow( Window w,GC g ) { |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
519 vo_window=w; vo_gc=g; |
1746 | 520 } |
723 | 521 #endif |
522 | |
4437 | 523 int vo_x11_uninit(Display *display, Window window) |
524 { | |
5658 | 525 vo_showcursor( display,window ); |
4742 | 526 |
4437 | 527 #ifdef HAVE_NEW_GUI |
528 /* destroy window only if it's not controlled by GUI */ | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
529 if ( !use_gui ) |
4437 | 530 #endif |
531 { | |
6059 | 532 XSetBackground( mDisplay,vo_gc,0 ); |
533 XClearWindow( mDisplay,vo_window ); | |
534 | |
4437 | 535 /* and -wid is set */ |
6016 | 536 if (WinID < 0) |
537 { | |
538 XUnmapWindow( display,window ); | |
539 XDestroyWindow(display, window); | |
540 } | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
541 vo_fs=0; |
4437 | 542 } |
543 return(1); | |
544 } | |
545 | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
546 int vo_mouse_timer_const = 30; |
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
547 static int vo_mouse_counter = 30; |
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
548 |
32 | 549 int vo_x11_check_events(Display *mydisplay){ |
550 int ret=0; | |
551 XEvent Event; | |
552 char buf[100]; | |
553 KeySym keySym; | |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by Jrgen Keil <jk@tools.de>
arpi_esp
parents:
922
diff
changeset
|
554 static XComposeStatus stat; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
555 |
32 | 556 // unsigned long vo_KeyTable[512]; |
557 | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
558 if ( ( vo_mouse_autohide )&&( --vo_mouse_counter == 0 ) ) vo_hidecursor( mydisplay,vo_window ); |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
559 |
4795 | 560 while ( XPending( mydisplay ) ) |
561 { | |
562 XNextEvent( mydisplay,&Event ); | |
4798 | 563 #ifdef HAVE_NEW_GUI |
5061 | 564 if ( use_gui ) |
565 { | |
566 guiGetEvent( 0,(char*)&Event ); | |
567 if ( vo_window != Event.xany.window ) continue; | |
568 } | |
4798 | 569 #endif |
4795 | 570 switch( Event.type ) |
571 { | |
572 case Expose: | |
573 ret|=VO_EVENT_EXPOSE; | |
574 break; | |
575 case ConfigureNotify: | |
576 vo_dwidth=Event.xconfigure.width; | |
577 vo_dheight=Event.xconfigure.height; | |
4812 | 578 #if 0 |
579 /* when resizing, x and y are zero :( */ | |
580 vo_dx=Event.xconfigure.x; | |
581 vo_dy=Event.xconfigure.y; | |
582 #else | |
583 { | |
584 Window root; | |
585 int foo; | |
586 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, | |
587 &foo/*width*/, &foo/*height*/, &foo, &foo); | |
588 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, | |
589 &vo_dx, &vo_dy, (Window *)&foo); | |
590 } | |
591 #endif | |
4795 | 592 ret|=VO_EVENT_RESIZE; |
593 break; | |
594 case KeyPress: | |
4974 | 595 { |
596 int key; | |
597 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat ); | |
598 key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) ); | |
599 #ifdef HAVE_NEW_GUI | |
600 if ( ( use_gui )&&( key == wsEnter ) ) break; | |
601 #endif | |
602 vo_x11_putkey( key ); | |
603 ret|=VO_EVENT_KEYPRESS; | |
604 } | |
4795 | 605 break; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
606 case MotionNotify: |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
607 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
608 break; |
4658 | 609 #ifdef HAVE_NEW_INPUT |
4795 | 610 case ButtonPress: |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
611 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
4795 | 612 // Ignore mouse whell press event |
5656
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
613 if(Event.xbutton.button > 3) { |
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
614 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); |
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
615 break; |
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
616 } |
5062 | 617 #ifdef HAVE_NEW_GUI |
618 // Ignor mouse button 1 - 3 under gui | |
619 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; | |
620 #endif | |
4795 | 621 mplayer_put_key((MOUSE_BTN0+Event.xbutton.button-1)|MP_KEY_DOWN); |
622 break; | |
623 case ButtonRelease: | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
624 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
5062 | 625 #ifdef HAVE_NEW_GUI |
626 // Ignor mouse button 1 - 3 under gui | |
627 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; | |
628 #endif | |
4795 | 629 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); |
630 break; | |
4658 | 631 #endif |
5835 | 632 case PropertyNotify: |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
633 { |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
634 char * name = XGetAtomName( mydisplay,Event.xproperty.atom ); |
6046 | 635 int wm = vo_wm_Unknown; |
636 | |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
637 if ( !name ) break; |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
638 |
6046 | 639 wm=vo_wm_string_test(name); |
640 if ( wm != vo_wm_Unknown ) vo_wm_type=wm; | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
641 |
6046 | 642 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
643 |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
644 XFree( name ); |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
645 } |
5835 | 646 break; |
723 | 647 } |
4795 | 648 } |
32 | 649 return ret; |
650 } | |
651 | |
5835 | 652 void vo_x11_sizehint( int x, int y, int width, int height, int max ) |
4993 | 653 { |
6046 | 654 vo_hint.flags=PPosition | PSize | PWinGravity; |
4993 | 655 vo_hint.x=x; vo_hint.y=y; vo_hint.width=width; vo_hint.height=height; |
5835 | 656 if ( max ) |
657 { | |
658 vo_hint.max_width=width; vo_hint.max_height=height; | |
659 vo_hint.flags|=PMaxSize; | |
660 } else { vo_hint.max_width=0; vo_hint.max_height=0; } | |
4993 | 661 vo_hint.win_gravity=StaticGravity; |
662 XSetWMNormalHints( mDisplay,vo_window,&vo_hint ); | |
663 } | |
664 | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
665 #define WIN_LAYER_ONBOTTOM 2 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
666 #define WIN_LAYER_NORMAL 4 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
667 #define WIN_LAYER_ONTOP 6 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
668 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
669 void vo_x11_setlayer( int layer ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
670 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
671 Atom type; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
672 int format; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
673 unsigned long nitems, bytesafter; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
674 unsigned char * args = NULL; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
675 |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
676 if ( WinID >= 0 ) return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
677 |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
678 if ( vo_wm_type == vo_wm_IceWM ) |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
679 { |
6043 | 680 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] IceWM style stay on top ( layer %d ).\n",layer ); |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
681 switch ( layer ) |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
682 { |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
683 case -1: layer=2; break; // WinLayerBelow |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
684 case 0: layer=4; break; // WinLayerNormal |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
685 case 1: layer=8; break; // WinLayerOnTop |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
686 } |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
687 XChangeProperty( mDisplay,vo_window, |
6043 | 688 XInternAtom( mDisplay,"_WIN_LAYER",False ),XA_CARDINAL,32,PropModeReplace,(unsigned char *)&layer,1 ); |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
689 return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
690 } |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
691 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
692 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
693 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
694 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
695 XEvent e; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
696 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
697 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ).\n",layer ); |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
698 memset( &e,0,sizeof( e ) ); |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
699 e.xclient.type=ClientMessage; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
700 e.xclient.message_type=XInternAtom( mDisplay,"_NET_WM_STATE",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
701 e.xclient.display=mDisplay; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
702 e.xclient.window=vo_window; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
703 e.xclient.format=32; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
704 e.xclient.data.l[0]=layer; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
705 e.xclient.data.l[1]=XInternAtom( mDisplay,"_NET_WM_STATE_STAYS_ON_TOP",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
706 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,&e ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
707 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
708 XFree( args ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
709 return; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
710 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
711 type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
712 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
713 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
714 XClientMessageEvent xev; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
715 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
716 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Gnome style stay on top ( layer %d ).\n",layer ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
717 memset( &xev,0,sizeof( xev ) ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
718 xev.type=ClientMessage; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
719 xev.window=vo_window; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
720 xev.message_type=XInternAtom( mDisplay,"_WIN_LAYER",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
721 xev.format=32; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
722 switch ( layer ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
723 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
724 case -1: xev.data.l[0] = WIN_LAYER_ONBOTTOM; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
725 case 0: xev.data.l[0] = WIN_LAYER_NORMAL; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
726 case 1: xev.data.l[0] = WIN_LAYER_ONTOP; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
727 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
728 XSendEvent( mDisplay,mRootWin,False,SubstructureNotifyMask,(XEvent*)&xev ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
729 if ( layer ) XRaiseWindow( mDisplay,vo_window ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
730 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
731 XFree( args ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
732 return; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
733 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
734 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
735 |
4981 | 736 void vo_x11_fullscreen( void ) |
737 { | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
738 int x=0,y=0,w=vo_screenwidth,h=vo_screenheight; |
5919 | 739 |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
740 if ( WinID >= 0 ) return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
741 |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
742 if ( vo_fs ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
743 { vo_fs=VO_FALSE; x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height; } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
744 else { vo_fs=VO_TRUE; vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight; } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
745 |
6043 | 746 vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 ); |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
747 vo_x11_sizehint( x,y,w,h,0 ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
748 vo_x11_setlayer( vo_fs ); |
6064
55b2b5da9bd2
small cleanup, new flag in -fsmode to avoid unmapping window for unknown wm
arpi
parents:
6059
diff
changeset
|
749 if(vo_wm_type==vo_wm_Unknown && !(vo_fsmode&16)) |
55b2b5da9bd2
small cleanup, new flag in -fsmode to avoid unmapping window for unknown wm
arpi
parents:
6059
diff
changeset
|
750 XUnmapWindow( mDisplay,vo_window ); // required for MWM |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
751 XMoveResizeWindow( mDisplay,vo_window,x,y,w,h ); |
5835 | 752 XMapRaised( mDisplay,vo_window ); |
753 XRaiseWindow( mDisplay,vo_window ); | |
754 XFlush( mDisplay ); | |
4981 | 755 } |
756 | |
324 | 757 void saver_on(Display *mDisplay) { |
758 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
759 #ifdef HAVE_XDPMS |
324 | 760 int nothing; |
761 if (dpms_disabled) | |
762 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
763 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
764 { |
741 | 765 if (!DPMSEnable(mDisplay)) { // restoring power saving settings |
766 printf("DPMS not available?\n"); | |
767 } else { | |
768 // DPMS does not seem to be enabled unless we call DPMSInfo | |
769 BOOL onoff; | |
770 CARD16 state; | |
771 DPMSInfo(mDisplay, &state, &onoff); | |
772 if (onoff) { | |
773 printf ("Successfully enabled DPMS\n"); | |
774 } else { | |
775 printf ("Could not enable DPMS\n"); | |
776 } | |
777 } | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
778 } |
324 | 779 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
780 #endif |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
781 |
324 | 782 if (timeout_save) |
783 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
784 int dummy, interval, prefer_blank, allow_exp; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
785 XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, &allow_exp); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
786 XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, allow_exp); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
787 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); |
324 | 788 } |
789 | |
790 } | |
791 | |
792 void saver_off(Display *mDisplay) { | |
793 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
794 int interval, prefer_blank, allow_exp; |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
795 #ifdef HAVE_XDPMS |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
796 int nothing; |
324 | 797 |
798 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) | |
799 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
800 BOOL onoff; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
801 CARD16 state; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
802 DPMSInfo(mDisplay, &state, &onoff); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
803 if (onoff) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
804 { |
741 | 805 Status stat; |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
806 printf ("Disabling DPMS\n"); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
807 dpms_disabled=1; |
741 | 808 stat = DPMSDisable(mDisplay); // monitor powersave off |
809 printf ("stat: %d\n", stat); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
810 } |
324 | 811 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
812 #endif |
324 | 813 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); |
814 if (timeout_save) | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
815 XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
816 // turning off screensaver |
326 | 817 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
818 |
3990 | 819 |
820 | |
821 #ifdef HAVE_XINERAMA | |
822 void vo_x11_xinerama_move(Display *dsp, Window w) | |
823 { | |
824 if(XineramaIsActive(dsp)) | |
825 { | |
4017 | 826 /* printf("XXXX Xinerama screen: x: %hd y: %hd\n",xinerama_x,xinerama_y); */ |
827 XMoveWindow(dsp,w,xinerama_x,xinerama_y); | |
3990 | 828 } |
829 } | |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
830 #endif |
3990 | 831 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
832 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
833 void vo_vm_switch(uint32_t X, uint32_t Y, int* modeline_width, int* modeline_height) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
834 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
835 unsigned int vm_event, vm_error; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
836 unsigned int vm_ver, vm_rev; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
837 int i,j,have_vm=0; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
838 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
839 int modecount; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
840 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
841 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
842 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
843 printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
844 have_vm=1; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
845 } else |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
846 printf("XF86VidMode Extenstion not available.\n"); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
847 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
848 if (have_vm) { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
849 if (vidmodes==NULL) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
850 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
851 j=0; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
852 *modeline_width=vidmodes[0]->hdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
853 *modeline_height=vidmodes[0]->vdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
854 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
855 for (i=1; i<modecount; i++) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
856 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y)) |
5538 | 857 if ( (vidmodes[i]->hdisplay <= *modeline_width ) && (vidmodes[i]->vdisplay <= *modeline_height) ) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
858 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
859 *modeline_width=vidmodes[i]->hdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
860 *modeline_height=vidmodes[i]->vdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
861 j=i; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
862 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
863 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
864 printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",*modeline_width, *modeline_height, X, Y); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
865 XF86VidModeLockModeSwitch(mDisplay,mScreen,0); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
866 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
867 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
868 X=(vo_screenwidth-*modeline_width)/2; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
869 Y=(vo_screenheight-*modeline_height)/2; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
870 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
871 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
872 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
873 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
874 void vo_vm_close(Display *dpy) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
875 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
876 #ifdef HAVE_NEW_GUI |
5019 | 877 if (vidmodes!=NULL && vo_window != None) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
878 #else |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
879 if (vidmodes!=NULL) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
880 #endif |
5019 | 881 { |
882 int i, modecount; | |
883 int screen; screen=DefaultScreen( dpy ); | |
884 | |
885 free(vidmodes); vidmodes=NULL; | |
886 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); | |
887 for (i=0; i<modecount; i++) | |
888 if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight)) | |
889 { | |
890 printf("\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight); | |
891 break; | |
892 } | |
893 | |
894 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]); | |
895 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]); | |
896 free(vidmodes); | |
897 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
898 } |
3990 | 899 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
900 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
901 #endif |