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