Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 6179:c9ae6db39df0
Let X destroy the window
author | albeu |
---|---|
date | Fri, 24 May 2002 21:56:58 +0000 |
parents | aee9c32349a9 |
children | 1e275c6cabb2 |
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; |
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
|
63 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
|
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; |
6089 | 71 int vo_wm_type = -1; |
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 | |
6077 | 157 static int x11_errorhandler(Display *display, XErrorEvent *event) |
4742 | 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 | |
6095 | 174 abort(); |
175 //exit_player("X11 error"); | |
4742 | 176 #undef MSGLEN |
177 } | |
1732 | 178 |
6046 | 179 int vo_wm_string_test( char * name ) |
180 { | |
181 if ( !strncmp( name,"_ICEWM_TRAY",11 ) ) | |
182 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" ); return vo_wm_IceWM; } | |
183 if ( !strncmp( name,"_KDE_",5 ) ) | |
184 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); return vo_wm_KDE; } | |
185 if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) | |
186 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); return vo_wm_WMakerStyle; } | |
187 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",win,name,xev.xproperty.atom ); | |
188 return vo_wm_Unknown; | |
189 } | |
190 | |
6009 | 191 int vo_wm_detect( void ) |
192 { | |
193 Atom type; | |
194 Window win; | |
195 XEvent xev; | |
196 int c = 0; | |
197 int wm = vo_wm_Unknown; | |
198 int format; | |
199 unsigned long nitems, bytesafter; | |
200 unsigned char * args = NULL; | |
6043 | 201 char * name = NULL; |
202 | |
203 if ( WinID >= 0 ) return vo_wm_Unknown; | |
204 | |
6009 | 205 #if 1 |
206 // --- netwm | |
207 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); | |
6164
aee9c32349a9
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents:
6140
diff
changeset
|
208 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) |
6009 | 209 { |
6043 | 210 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" ); |
6009 | 211 XFree( args ); |
212 return vo_wm_NetWM; | |
213 } | |
214 #endif | |
215 // --- other wm | |
216 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Create window for WM detect ...\n" ); | |
217 win=XCreateSimpleWindow( mDisplay,mRootWin,vo_screenwidth,vo_screenheight,1,1,0,0,0 ); | |
218 XSelectInput( mDisplay,win,PropertyChangeMask | StructureNotifyMask ); | |
219 XMapWindow( mDisplay,win ); | |
220 XMoveWindow( mDisplay,win,vo_screenwidth,vo_screenheight ); | |
221 do | |
222 { | |
223 XCheckWindowEvent( mDisplay,win,PropertyChangeMask | StructureNotifyMask,&xev ); | |
224 | |
225 if ( xev.type == PropertyNotify ) | |
226 { | |
6043 | 227 name=XGetAtomName( mDisplay,xev.xproperty.atom ); |
6009 | 228 if ( !name ) break; |
229 | |
6046 | 230 wm=vo_wm_string_test( name ); |
231 if ( wm != vo_wm_Unknown ) break; | |
6043 | 232 XFree( name ); name=NULL; |
6009 | 233 } |
234 } while( c++ < 25 ); | |
6043 | 235 if ( name ) XFree( name ); |
6089 | 236 XUnmapWindow( mDisplay,win ); |
6009 | 237 XDestroyWindow( mDisplay,win ); |
238 #ifdef MP_DEBUG | |
239 if ( wm == vo_wm_Unknown ) mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Unknown wm type...\n" ); | |
240 #endif | |
241 return wm; | |
242 } | |
243 | |
32 | 244 int vo_init( void ) |
245 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
246 // int mScreen; |
1732 | 247 int depth, bpp; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
248 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
|
249 // 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
|
250 // Display * mDisplay; |
1732 | 251 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
|
252 // Window mRootWin; |
1732 | 253 XWindowAttributes attribs; |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
254 char* dispName; |
32 | 255 |
256 if(vo_depthonscreen) return 1; // already called | |
257 | |
4812 | 258 XSetErrorHandler(x11_errorhandler); |
259 | |
260 #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
|
261 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
|
262 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
|
263 mDisplayName=strdup(":0.0"); |
4812 | 264 #else |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
265 dispName = XDisplayName(mDisplayName); |
4812 | 266 #endif |
267 | |
268 if (verbose) | |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
269 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
|
270 |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
271 mDisplay=XOpenDisplay(dispName); |
32 | 272 if ( !mDisplay ) |
273 { | |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4812
diff
changeset
|
274 printf( "vo: couldn't open the X11 display (%s)!\n",dispName ); |
32 | 275 return 0; |
276 } | |
277 mScreen=DefaultScreen( mDisplay ); // Screen ID. | |
278 mRootWin=RootWindow( mDisplay,mScreen );// Root window ID. | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
279 |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
280 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
281 if(XineramaIsActive(mDisplay)) |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
282 { |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
283 XineramaScreenInfo *screens; |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
284 int num_screens; |
3990 | 285 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
286 screens = XineramaQueryScreens(mDisplay, &num_screens); |
4017 | 287 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
|
288 if (! vo_screenwidth) |
4017 | 289 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
|
290 if (! vo_screenheight) |
4017 | 291 vo_screenheight=screens[xinerama_screen].height; |
292 xinerama_x = screens[xinerama_screen].x_org; | |
293 xinerama_y = screens[xinerama_screen].y_org; | |
294 | |
3990 | 295 XFree(screens); |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
296 } |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
297 else |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
298 #endif |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
299 #ifdef HAVE_XF86VM |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
300 { |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
301 int clock; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
302 XF86VidModeGetModeLine( mDisplay,mScreen,&clock ,&modeline ); |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
303 if ( !vo_screenwidth ) vo_screenwidth=modeline.hdisplay; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
304 if ( !vo_screenheight ) vo_screenheight=modeline.vdisplay; |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
305 } |
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
306 #endif |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
307 { |
2364 | 308 if (! vo_screenwidth) |
309 vo_screenwidth=DisplayWidth( mDisplay,mScreen ); | |
310 if (! vo_screenheight) | |
311 vo_screenheight=DisplayHeight( mDisplay,mScreen ); | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
312 } |
1732 | 313 // get color depth (from root window, or the best visual): |
32 | 314 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
1732 | 315 depth=attribs.depth; |
316 | |
317 #ifdef SCAN_VISUALS | |
318 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) { | |
319 Visual *visual; | |
320 | |
321 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); | |
322 if (depth != -1) | |
323 mXImage=XCreateImage(mDisplay, visual, depth, ZPixmap, | |
324 0, NULL, 1, 1, 8, 1); | |
325 } else | |
326 #endif | |
327 mXImage=XGetImage( mDisplay,mRootWin,0,0,1,1,AllPlanes,ZPixmap ); | |
328 | |
329 vo_depthonscreen = depth; // display depth on screen | |
330 | |
331 // get bits/pixel from XImage structure: | |
332 if (mXImage == NULL) { | |
333 mask = 0; | |
334 } else { | |
335 /* | |
336 * for the depth==24 case, the XImage structures might use | |
337 * 24 or 32 bits of data per pixel. The global variable | |
338 * vo_depthonscreen stores the amount of data per pixel in the | |
339 * XImage structure! | |
340 * | |
341 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp? | |
342 */ | |
32 | 343 bpp=mXImage->bits_per_pixel; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
344 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
|
345 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
|
346 if(verbose) |
1732 | 347 printf("vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", |
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; |
1732 | 362 printf("vo: X11 running at %dx%d with depth %d and %d bits/pixel (\"%s\" => %s display)\n", |
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; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
380 printf("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; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
516 wmClass.res_name = name; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
517 wmClass.res_class = "MPlayer"; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
518 XSetClassHint(display,window,&wmClass); |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
519 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
520 |
4993 | 521 Window vo_window = None; |
6095 | 522 GC vo_gc = NULL; |
4993 | 523 XSizeHints vo_hint; |
4795 | 524 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
525 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
526 void vo_setwindow( Window w,GC g ) { |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
527 vo_window=w; vo_gc=g; |
1746 | 528 } |
723 | 529 #endif |
530 | |
6095 | 531 void vo_x11_uninit() |
4437 | 532 { |
6095 | 533 if(vo_window!=None) vo_showcursor( mDisplay,vo_window ); |
4742 | 534 |
4437 | 535 #ifdef HAVE_NEW_GUI |
536 /* 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
|
537 if ( !use_gui ) |
4437 | 538 #endif |
539 { | |
6095 | 540 if(vo_gc){ |
541 XSetBackground( mDisplay,vo_gc,0 ); | |
542 vo_gc=NULL; | |
543 } | |
544 if(vo_window!=None){ | |
545 XClearWindow( mDisplay,vo_window ); | |
546 if (WinID < 0){ | |
6179 | 547 XEvent xev; |
6095 | 548 XUnmapWindow( mDisplay,vo_window ); |
549 XDestroyWindow(mDisplay, vo_window); | |
6179 | 550 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != DestroyNotify || xev.xdestroywindow.event != vo_window ); |
6095 | 551 } |
552 vo_window=None; | |
553 } | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
554 vo_fs=0; |
4437 | 555 } |
556 } | |
557 | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
558 int vo_mouse_timer_const = 30; |
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
559 static int vo_mouse_counter = 30; |
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
560 |
32 | 561 int vo_x11_check_events(Display *mydisplay){ |
562 int ret=0; | |
563 XEvent Event; | |
564 char buf[100]; | |
565 KeySym keySym; | |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by Jrgen Keil <jk@tools.de>
arpi_esp
parents:
922
diff
changeset
|
566 static XComposeStatus stat; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
567 |
32 | 568 // unsigned long vo_KeyTable[512]; |
569 | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
570 if ( ( vo_mouse_autohide )&&( --vo_mouse_counter == 0 ) ) vo_hidecursor( mydisplay,vo_window ); |
6095 | 571 |
4795 | 572 while ( XPending( mydisplay ) ) |
573 { | |
574 XNextEvent( mydisplay,&Event ); | |
4798 | 575 #ifdef HAVE_NEW_GUI |
5061 | 576 if ( use_gui ) |
577 { | |
578 guiGetEvent( 0,(char*)&Event ); | |
579 if ( vo_window != Event.xany.window ) continue; | |
580 } | |
4798 | 581 #endif |
6095 | 582 // printf("\rEvent.type=%X \n",Event.type); |
4795 | 583 switch( Event.type ) |
584 { | |
585 case Expose: | |
586 ret|=VO_EVENT_EXPOSE; | |
587 break; | |
588 case ConfigureNotify: | |
589 vo_dwidth=Event.xconfigure.width; | |
590 vo_dheight=Event.xconfigure.height; | |
4812 | 591 #if 0 |
592 /* when resizing, x and y are zero :( */ | |
593 vo_dx=Event.xconfigure.x; | |
594 vo_dy=Event.xconfigure.y; | |
595 #else | |
596 { | |
597 Window root; | |
598 int foo; | |
6140
44dcc49a0d80
64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents:
6111
diff
changeset
|
599 Window win; |
4812 | 600 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, |
601 &foo/*width*/, &foo/*height*/, &foo, &foo); | |
602 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, | |
6140
44dcc49a0d80
64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents:
6111
diff
changeset
|
603 &vo_dx, &vo_dy, &win); |
4812 | 604 } |
605 #endif | |
4795 | 606 ret|=VO_EVENT_RESIZE; |
607 break; | |
608 case KeyPress: | |
4974 | 609 { |
610 int key; | |
611 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat ); | |
612 key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) ); | |
613 #ifdef HAVE_NEW_GUI | |
614 if ( ( use_gui )&&( key == wsEnter ) ) break; | |
615 #endif | |
616 vo_x11_putkey( key ); | |
617 ret|=VO_EVENT_KEYPRESS; | |
618 } | |
4795 | 619 break; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
620 case MotionNotify: |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
621 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
|
622 break; |
4658 | 623 #ifdef HAVE_NEW_INPUT |
4795 | 624 case ButtonPress: |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
625 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
4795 | 626 // 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
|
627 if(Event.xbutton.button > 3) { |
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
628 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
|
629 break; |
70031f0cc4d2
Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents:
5651
diff
changeset
|
630 } |
5062 | 631 #ifdef HAVE_NEW_GUI |
632 // Ignor mouse button 1 - 3 under gui | |
633 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; | |
634 #endif | |
4795 | 635 mplayer_put_key((MOUSE_BTN0+Event.xbutton.button-1)|MP_KEY_DOWN); |
636 break; | |
637 case ButtonRelease: | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
638 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
5062 | 639 #ifdef HAVE_NEW_GUI |
640 // Ignor mouse button 1 - 3 under gui | |
641 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; | |
642 #endif | |
4795 | 643 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); |
644 break; | |
4658 | 645 #endif |
5835 | 646 case PropertyNotify: |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
647 { |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
648 char * name = XGetAtomName( mydisplay,Event.xproperty.atom ); |
6046 | 649 int wm = vo_wm_Unknown; |
650 | |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
651 if ( !name ) break; |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
652 |
6046 | 653 wm=vo_wm_string_test(name); |
654 if ( wm != vo_wm_Unknown ) vo_wm_type=wm; | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
655 |
6046 | 656 // 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
|
657 |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
658 XFree( name ); |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5835
diff
changeset
|
659 } |
5835 | 660 break; |
723 | 661 } |
4795 | 662 } |
32 | 663 return ret; |
664 } | |
665 | |
5835 | 666 void vo_x11_sizehint( int x, int y, int width, int height, int max ) |
4993 | 667 { |
6046 | 668 vo_hint.flags=PPosition | PSize | PWinGravity; |
4993 | 669 vo_hint.x=x; vo_hint.y=y; vo_hint.width=width; vo_hint.height=height; |
5835 | 670 if ( max ) |
671 { | |
672 vo_hint.max_width=width; vo_hint.max_height=height; | |
673 vo_hint.flags|=PMaxSize; | |
674 } else { vo_hint.max_width=0; vo_hint.max_height=0; } | |
4993 | 675 vo_hint.win_gravity=StaticGravity; |
676 XSetWMNormalHints( mDisplay,vo_window,&vo_hint ); | |
677 } | |
678 | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
679 #define WIN_LAYER_ONBOTTOM 2 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
680 #define WIN_LAYER_NORMAL 4 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
681 #define WIN_LAYER_ONTOP 6 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
682 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
683 void vo_x11_setlayer( int layer ) |
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 Atom type; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
686 int format; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
687 unsigned long nitems, bytesafter; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
688 unsigned char * args = NULL; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
689 |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
690 if ( WinID >= 0 ) return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
691 |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
692 if ( vo_wm_type == vo_wm_IceWM ) |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
693 { |
6043 | 694 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
|
695 switch ( layer ) |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
696 { |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
697 case -1: layer=2; break; // WinLayerBelow |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
698 case 0: layer=4; break; // WinLayerNormal |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
699 case 1: layer=8; break; // WinLayerOnTop |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
700 } |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
701 XChangeProperty( mDisplay,vo_window, |
6043 | 702 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
|
703 return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
704 } |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
705 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
706 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); |
6164
aee9c32349a9
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents:
6140
diff
changeset
|
707 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
|
708 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
709 XEvent e; |
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 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
|
712 memset( &e,0,sizeof( e ) ); |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
713 e.xclient.type=ClientMessage; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
714 e.xclient.message_type=XInternAtom( mDisplay,"_NET_WM_STATE",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
715 e.xclient.display=mDisplay; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
716 e.xclient.window=vo_window; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
717 e.xclient.format=32; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
718 e.xclient.data.l[0]=layer; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
719 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
|
720 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,&e ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
721 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
722 XFree( args ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
723 return; |
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 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
|
726 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
|
727 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
728 XClientMessageEvent xev; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
729 |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
730 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
|
731 memset( &xev,0,sizeof( xev ) ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
732 xev.type=ClientMessage; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
733 xev.window=vo_window; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
734 xev.message_type=XInternAtom( mDisplay,"_WIN_LAYER",False ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
735 xev.format=32; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
736 switch ( layer ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
737 { |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
738 case -1: xev.data.l[0] = WIN_LAYER_ONBOTTOM; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
739 case 0: xev.data.l[0] = WIN_LAYER_NORMAL; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
740 case 1: xev.data.l[0] = WIN_LAYER_ONTOP; break; |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
741 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
742 XSendEvent( mDisplay,mRootWin,False,SubstructureNotifyMask,(XEvent*)&xev ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
743 if ( layer ) XRaiseWindow( mDisplay,vo_window ); |
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 XFree( args ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
746 return; |
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 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
749 |
4981 | 750 void vo_x11_fullscreen( void ) |
751 { | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
752 int x=0,y=0,w=vo_screenwidth,h=vo_screenheight; |
5919 | 753 |
6034
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
754 if ( WinID >= 0 ) return; |
7570f4666c15
fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents:
6016
diff
changeset
|
755 |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
756 if ( vo_fs ) |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
757 { 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
|
758 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
|
759 |
6043 | 760 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
|
761 vo_x11_sizehint( x,y,w,h,0 ); |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
762 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
|
763 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
|
764 XUnmapWindow( mDisplay,vo_window ); // required for MWM |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
765 XMoveResizeWindow( mDisplay,vo_window,x,y,w,h ); |
5835 | 766 XMapRaised( mDisplay,vo_window ); |
767 XRaiseWindow( mDisplay,vo_window ); | |
768 XFlush( mDisplay ); | |
4981 | 769 } |
770 | |
324 | 771 void saver_on(Display *mDisplay) { |
772 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
773 #ifdef HAVE_XDPMS |
324 | 774 int nothing; |
775 if (dpms_disabled) | |
776 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
777 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
|
778 { |
741 | 779 if (!DPMSEnable(mDisplay)) { // restoring power saving settings |
780 printf("DPMS not available?\n"); | |
781 } else { | |
782 // DPMS does not seem to be enabled unless we call DPMSInfo | |
783 BOOL onoff; | |
784 CARD16 state; | |
785 DPMSInfo(mDisplay, &state, &onoff); | |
786 if (onoff) { | |
787 printf ("Successfully enabled DPMS\n"); | |
788 } else { | |
789 printf ("Could not enable DPMS\n"); | |
790 } | |
791 } | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
792 } |
324 | 793 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
794 #endif |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
795 |
324 | 796 if (timeout_save) |
797 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
798 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
|
799 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
|
800 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
|
801 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); |
324 | 802 } |
803 | |
804 } | |
805 | |
806 void saver_off(Display *mDisplay) { | |
807 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
808 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
|
809 #ifdef HAVE_XDPMS |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
810 int nothing; |
324 | 811 |
812 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) | |
813 { | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
814 BOOL onoff; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
815 CARD16 state; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
816 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
|
817 if (onoff) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
818 { |
741 | 819 Status stat; |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
456
diff
changeset
|
820 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
|
821 dpms_disabled=1; |
741 | 822 stat = DPMSDisable(mDisplay); // monitor powersave off |
823 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
|
824 } |
324 | 825 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
826 #endif |
324 | 827 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); |
828 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
|
829 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
|
830 // turning off screensaver |
326 | 831 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
832 |
3990 | 833 |
834 | |
835 #ifdef HAVE_XINERAMA | |
836 void vo_x11_xinerama_move(Display *dsp, Window w) | |
837 { | |
838 if(XineramaIsActive(dsp)) | |
839 { | |
4017 | 840 /* printf("XXXX Xinerama screen: x: %hd y: %hd\n",xinerama_x,xinerama_y); */ |
841 XMoveWindow(dsp,w,xinerama_x,xinerama_y); | |
3990 | 842 } |
843 } | |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
844 #endif |
3990 | 845 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
846 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
847 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
|
848 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
849 unsigned int vm_event, vm_error; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
850 unsigned int vm_ver, vm_rev; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
851 int i,j,have_vm=0; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
852 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
853 int modecount; |
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 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
856 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
857 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
|
858 have_vm=1; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
859 } else |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
860 printf("XF86VidMode Extenstion not available.\n"); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
861 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
862 if (have_vm) { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
863 if (vidmodes==NULL) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
864 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
865 j=0; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
866 *modeline_width=vidmodes[0]->hdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
867 *modeline_height=vidmodes[0]->vdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
868 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
869 for (i=1; i<modecount; i++) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
870 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y)) |
5538 | 871 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
|
872 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
873 *modeline_width=vidmodes[i]->hdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
874 *modeline_height=vidmodes[i]->vdisplay; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
875 j=i; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
876 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
877 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
878 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
|
879 XF86VidModeLockModeSwitch(mDisplay,mScreen,0); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
880 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
881 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
882 X=(vo_screenwidth-*modeline_width)/2; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
883 Y=(vo_screenheight-*modeline_height)/2; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
884 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
885 } |
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 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
888 void vo_vm_close(Display *dpy) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
889 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
890 #ifdef HAVE_NEW_GUI |
5019 | 891 if (vidmodes!=NULL && vo_window != None) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
892 #else |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
893 if (vidmodes!=NULL) |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
894 #endif |
5019 | 895 { |
896 int i, modecount; | |
897 int screen; screen=DefaultScreen( dpy ); | |
898 | |
899 free(vidmodes); vidmodes=NULL; | |
900 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); | |
901 for (i=0; i<modecount; i++) | |
902 if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight)) | |
903 { | |
904 printf("\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight); | |
905 break; | |
906 } | |
907 | |
908 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]); | |
909 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]); | |
910 free(vidmodes); | |
911 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
912 } |
3990 | 913 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
914 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
915 #endif |