Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 21758:bb3212f8b1fe
Add some explicit casts to avoid "assignment from incompatible pointer type"
warnings
author | lucabe |
---|---|
date | Tue, 26 Dec 2006 17:41:38 +0000 |
parents | c6631583d68d |
children | eaf6ed9cb5ab |
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> | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
4 #include <math.h> |
6401 | 5 #include <inttypes.h> |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
6 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
7 #include "config.h" |
5998 | 8 #include "mp_msg.h" |
6401 | 9 #include "x11_common.h" |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
10 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
11 #ifdef X11_FULLSCREEN |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
12 |
440
d19a3da6ac13
Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;)
gabucino
parents:
416
diff
changeset
|
13 #include <string.h> |
32 | 14 #include <unistd.h> |
9695 | 15 #include <signal.h> |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
16 #include <assert.h> |
32 | 17 |
18 #include "video_out.h" | |
10889 | 19 #include "aspect.h" |
12032
8cc4d4344c0f
Don't mess with the window position in xinerama when -geometry changes it.
diego
parents:
12031
diff
changeset
|
20 #include "geometry.h" |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
21 #include "help_mp.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
22 #include "osdep/timer.h" |
32 | 23 |
324 | 24 #include <X11/Xmd.h> |
32 | 25 #include <X11/Xlib.h> |
26 #include <X11/Xutil.h> | |
27 #include <X11/Xatom.h> | |
28 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
29 #ifdef HAVE_XDPMS |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
30 #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
|
31 #endif |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
32 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
33 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
34 #include <X11/extensions/Xinerama.h> |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
35 #endif |
1732 | 36 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
37 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
38 #include <X11/extensions/xf86vmode.h> |
14636
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
39 #endif |
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
40 |
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
41 #ifdef HAVE_XF86XK |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
42 #include <X11/XF86keysym.h> |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
43 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
44 |
10359 | 45 #ifdef HAVE_XV |
46 #include <X11/extensions/Xv.h> | |
47 #include <X11/extensions/Xvlib.h> | |
14742 | 48 |
49 #include "subopt-helper.h" | |
10359 | 50 #endif |
51 | |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
52 #include "input/input.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
53 #include "input/mouse.h" |
4658 | 54 |
4798 | 55 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
56 #include "Gui/interface.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
57 #include "mplayer.h" |
4798 | 58 #endif |
59 | |
8660
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
60 #define WIN_LAYER_ONBOTTOM 2 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
61 #define WIN_LAYER_NORMAL 4 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
62 #define WIN_LAYER_ONTOP 6 |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
63 #define WIN_LAYER_ABOVE_DOCK 10 |
12582 | 64 |
19850
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
65 extern int enable_mouse_movements; |
12582 | 66 int fs_layer = WIN_LAYER_ABOVE_DOCK; |
67 static int orig_layer = 0; | |
12111
8e31aacc3e81
- win_gravity memorizing and restoring while switching fullscreen mode (by Adam Tla/lka)
rathann
parents:
12096
diff
changeset
|
68 static int old_gravity = NorthWestGravity; |
8866 | 69 |
12582 | 70 int stop_xscreensaver = 0; |
6202 | 71 |
12582 | 72 static int dpms_disabled = 0; |
73 static int timeout_save = 0; | |
74 static int kdescreensaver_was_running = 0; | |
324 | 75 |
12582 | 76 char *mDisplayName = NULL; |
77 Display *mDisplay = NULL; | |
78 Window mRootWin; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
79 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
|
80 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
|
81 |
3830 | 82 /* output window id */ |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
83 int vo_mouse_autohide = 0; |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
84 int vo_wm_type = 0; |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
85 int vo_fs_type = 0; // needs to be accessible for GUI X11 code |
12125
f4fc74a88e65
full screen flipping synchronization corrections (by Adam Tla/lka)
rathann
parents:
12123
diff
changeset
|
86 static int vo_fs_flip = 0; |
12582 | 87 char **vo_fstype_list; |
384 | 88 |
8835
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
89 /* if equal to 1 means that WM is a metacity (broken as hell) */ |
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
90 int metacity_hack = 0; |
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
91 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
92 static Atom XA_NET_SUPPORTED; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
93 static Atom XA_NET_WM_STATE; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
94 static Atom XA_NET_WM_STATE_FULLSCREEN; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
95 static Atom XA_NET_WM_STATE_ABOVE; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
96 static Atom XA_NET_WM_STATE_STAYS_ON_TOP; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
97 static Atom XA_NET_WM_STATE_BELOW; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
98 static Atom XA_NET_WM_PID; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
99 static Atom XA_WIN_PROTOCOLS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
100 static Atom XA_WIN_LAYER; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
101 static Atom XA_WIN_HINTS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
102 static Atom XA_BLACKBOX_PID; |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
103 static Atom XAWM_PROTOCOLS; |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
104 static Atom XAWM_DELETE_WINDOW; |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
105 |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
106 #define XA_INIT(x) XA##x = XInternAtom(mDisplay, #x, False) |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
107 |
7435 | 108 static int vo_old_x = 0; |
109 static int vo_old_y = 0; | |
110 static int vo_old_width = 0; | |
111 static int vo_old_height = 0; | |
112 | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
113 #ifdef HAVE_XF86VM |
12582 | 114 XF86VidModeModeInfo **vidmodes = NULL; |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
115 XF86VidModeModeLine modeline; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
116 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
117 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
118 static int vo_x11_get_fs_type(int supported); |
10212
d358fa9a1068
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10193
diff
changeset
|
119 |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
120 |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
121 /* |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
122 * Sends the EWMH fullscreen state event. |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
123 * |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
124 * action: could be on of _NET_WM_STATE_REMOVE -- remove state |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
125 * _NET_WM_STATE_ADD -- add state |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
126 * _NET_WM_STATE_TOGGLE -- toggle |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
127 */ |
12582 | 128 void vo_x11_ewmh_fullscreen(int action) |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
129 { |
12582 | 130 assert(action == _NET_WM_STATE_REMOVE || |
131 action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE); | |
132 | |
133 if (vo_fs_type & vo_wm_FULLSCREEN) | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
134 { |
12582 | 135 XEvent xev; |
136 | |
137 /* init X event structure for _NET_WM_FULLSCREEN client msg */ | |
138 xev.xclient.type = ClientMessage; | |
139 xev.xclient.serial = 0; | |
140 xev.xclient.send_event = True; | |
141 xev.xclient.message_type = XInternAtom(mDisplay, | |
142 "_NET_WM_STATE", False); | |
143 xev.xclient.window = vo_window; | |
144 xev.xclient.format = 32; | |
145 xev.xclient.data.l[0] = action; | |
146 xev.xclient.data.l[1] = XInternAtom(mDisplay, | |
147 "_NET_WM_STATE_FULLSCREEN", | |
148 False); | |
149 xev.xclient.data.l[2] = 0; | |
150 xev.xclient.data.l[3] = 0; | |
151 xev.xclient.data.l[4] = 0; | |
152 | |
153 /* finally send that damn thing */ | |
154 if (!XSendEvent(mDisplay, DefaultRootWindow(mDisplay), False, | |
155 SubstructureRedirectMask | SubstructureNotifyMask, | |
156 &xev)) | |
157 { | |
158 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_EwmhFullscreenStateFailed); | |
159 } | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
160 } |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
161 } |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
162 |
12582 | 163 void vo_hidecursor(Display * disp, Window win) |
384 | 164 { |
12582 | 165 Cursor no_ptr; |
166 Pixmap bm_no; | |
167 XColor black, dummy; | |
168 Colormap colormap; | |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
169 static char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; |
3954 | 170 |
12582 | 171 if (WinID == 0) |
172 return; // do not hide, if we're playing at rootwin | |
173 | |
174 colormap = DefaultColormap(disp, DefaultScreen(disp)); | |
14743
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
175 if ( !XAllocNamedColor(disp, colormap, "black", &black, &dummy) ) |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
176 { |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
177 return; // color alloc failed, give up |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
178 } |
12582 | 179 bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8); |
180 no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0); | |
181 XDefineCursor(disp, win, no_ptr); | |
182 XFreeCursor(disp, no_ptr); | |
183 if (bm_no != None) | |
184 XFreePixmap(disp, bm_no); | |
13953 | 185 XFreeColors(disp,colormap,&black.pixel,1,0); |
384 | 186 } |
187 | |
12582 | 188 void vo_showcursor(Display * disp, Window win) |
189 { | |
190 if (WinID == 0) | |
191 return; | |
192 XDefineCursor(disp, win, 0); | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
193 } |
384 | 194 |
12582 | 195 static int x11_errorhandler(Display * display, XErrorEvent * event) |
4742 | 196 { |
197 #define MSGLEN 60 | |
198 char msg[MSGLEN]; | |
12582 | 199 |
200 XGetErrorText(display, event->error_code, (char *) &msg, MSGLEN); | |
201 | |
202 mp_msg(MSGT_VO, MSGL_ERR, "X11 error: %s\n", msg); | |
203 | |
204 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 205 "Type: %x, display: %p, resourceid: %lx, serial: %lx\n", |
12582 | 206 event->type, event->display, event->resourceid, event->serial); |
207 mp_msg(MSGT_VO, MSGL_V, | |
208 "Error code: %x, request code: %x, minor code: %x\n", | |
209 event->error_code, event->request_code, event->minor_code); | |
210 | |
6095 | 211 abort(); |
212 //exit_player("X11 error"); | |
4742 | 213 #undef MSGLEN |
214 } | |
1732 | 215 |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
216 void fstype_help(void) |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
217 { |
12582 | 218 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType); |
18237
4231482179b6
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents:
18160
diff
changeset
|
219 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n"); |
12582 | 220 |
221 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none", | |
222 "don't set fullscreen window layer"); | |
223 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer", | |
224 "use _WIN_LAYER hint with default layer"); | |
225 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer=<0..15>", | |
226 "use _WIN_LAYER hint with a given layer number"); | |
227 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "netwm", | |
228 "force NETWM style"); | |
229 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "above", | |
230 "use _NETWM_STATE_ABOVE hint if available"); | |
231 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below", | |
232 "use _NETWM_STATE_BELOW hint if available"); | |
233 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen", | |
234 "use _NETWM_STATE_FULLSCREEN hint if availale"); | |
235 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top", | |
236 "use _NETWM_STATE_STAYS_ON_TOP hint if available"); | |
237 mp_msg(MSGT_VO, MSGL_INFO, | |
238 "You can also negate the settings with simply putting '-' in the beginning"); | |
17727
096cb1dfb591
Make -xy help output consistent, output an empty line before and after.
diego
parents:
17566
diff
changeset
|
239 mp_msg(MSGT_VO, MSGL_INFO, "\n"); |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
240 } |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
241 |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
242 static void fstype_dump(int fstype) |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
243 { |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
244 if (fstype) |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
245 { |
12582 | 246 mp_msg(MSGT_VO, MSGL_V, "[x11] Current fstype setting honours"); |
247 if (fstype & vo_wm_LAYER) | |
248 mp_msg(MSGT_VO, MSGL_V, " LAYER"); | |
249 if (fstype & vo_wm_FULLSCREEN) | |
250 mp_msg(MSGT_VO, MSGL_V, " FULLSCREEN"); | |
251 if (fstype & vo_wm_STAYS_ON_TOP) | |
252 mp_msg(MSGT_VO, MSGL_V, " STAYS_ON_TOP"); | |
253 if (fstype & vo_wm_ABOVE) | |
254 mp_msg(MSGT_VO, MSGL_V, " ABOVE"); | |
255 if (fstype & vo_wm_BELOW) | |
256 mp_msg(MSGT_VO, MSGL_V, " BELOW"); | |
257 mp_msg(MSGT_VO, MSGL_V, " X atoms\n"); | |
258 } else | |
259 mp_msg(MSGT_VO, MSGL_V, | |
260 "[x11] Current fstype setting doesn't honour any X atoms\n"); | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
261 } |
12582 | 262 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
263 static int net_wm_support_state_test(Atom atom) |
8653 | 264 { |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
265 #define NET_WM_STATE_TEST(x) { if (atom == XA_NET_WM_STATE_##x) { mp_msg( MSGT_VO,MSGL_V, "[x11] Detected wm supports " #x " state.\n" ); return vo_wm_##x; } } |
12582 | 266 |
267 NET_WM_STATE_TEST(FULLSCREEN); | |
268 NET_WM_STATE_TEST(ABOVE); | |
269 NET_WM_STATE_TEST(STAYS_ON_TOP); | |
270 NET_WM_STATE_TEST(BELOW); | |
271 return 0; | |
8653 | 272 } |
273 | |
12582 | 274 static int x11_get_property(Atom type, Atom ** args, unsigned long *nitems) |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
275 { |
12582 | 276 int format; |
277 unsigned long bytesafter; | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
278 |
12582 | 279 return (Success == |
280 XGetWindowProperty(mDisplay, mRootWin, type, 0, 16384, False, | |
281 AnyPropertyType, &type, &format, nitems, | |
282 &bytesafter, (unsigned char **) args) | |
283 && *nitems > 0); | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
284 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
285 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
286 static int vo_wm_detect(void) |
6009 | 287 { |
12582 | 288 int i; |
289 int wm = 0; | |
290 unsigned long nitems; | |
291 Atom *args = NULL; | |
292 | |
293 if (WinID >= 0) | |
294 return 0; | |
295 | |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
296 // -- supports layers |
12582 | 297 if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems)) |
298 { | |
299 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports layers.\n"); | |
300 for (i = 0; i < nitems; i++) | |
301 { | |
302 if (args[i] == XA_WIN_LAYER) | |
303 { | |
304 wm |= vo_wm_LAYER; | |
305 metacity_hack |= 1; | |
306 } else | |
307 // metacity is the only manager I know which reports support only for _WIN_LAYER | |
308 // hint in _WIN_PROTOCOLS (what's more support for it is broken) | |
309 metacity_hack |= 2; | |
310 } | |
311 XFree(args); | |
312 if (wm && (metacity_hack == 1)) | |
313 { | |
314 // metacity reports that it supports layers, but it is not really truth :-) | |
315 wm ^= vo_wm_LAYER; | |
316 mp_msg(MSGT_VO, MSGL_V, | |
317 "[x11] Using workaround for Metacity bugs.\n"); | |
318 } | |
319 } | |
6009 | 320 // --- netwm |
12582 | 321 if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems)) |
322 { | |
323 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports NetWM.\n"); | |
324 for (i = 0; i < nitems; i++) | |
325 wm |= net_wm_support_state_test(args[i]); | |
326 XFree(args); | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
327 #if 0 |
12582 | 328 // ugly hack for broken OpenBox _NET_WM_STATE_FULLSCREEN support |
329 // (in their implementation it only changes internal state of window, nothing more!!!) | |
330 if (wm & vo_wm_FULLSCREEN) | |
331 { | |
332 if (x11_get_property(XA_BLACKBOX_PID, &args, &nitems)) | |
333 { | |
334 mp_msg(MSGT_VO, MSGL_V, | |
335 "[x11] Detected wm is a broken OpenBox.\n"); | |
336 wm ^= vo_wm_FULLSCREEN; | |
337 } | |
338 XFree(args); | |
339 } | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
340 #endif |
12582 | 341 } |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
342 |
12582 | 343 if (wm == 0) |
344 mp_msg(MSGT_VO, MSGL_V, "[x11] Unknown wm type...\n"); | |
345 return wm; | |
346 } | |
6009 | 347 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
348 static void init_atoms(void) |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
349 { |
12582 | 350 XA_INIT(_NET_SUPPORTED); |
351 XA_INIT(_NET_WM_STATE); | |
352 XA_INIT(_NET_WM_STATE_FULLSCREEN); | |
353 XA_INIT(_NET_WM_STATE_ABOVE); | |
354 XA_INIT(_NET_WM_STATE_STAYS_ON_TOP); | |
355 XA_INIT(_NET_WM_STATE_BELOW); | |
356 XA_INIT(_NET_WM_PID); | |
357 XA_INIT(_WIN_PROTOCOLS); | |
358 XA_INIT(_WIN_LAYER); | |
359 XA_INIT(_WIN_HINTS); | |
360 XA_INIT(_BLACKBOX_PID); | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
361 XA_INIT(WM_PROTOCOLS); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
362 XA_INIT(WM_DELETE_WINDOW); |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
363 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
364 |
18116 | 365 void update_xinerama_info(void) { |
366 int screen = xinerama_screen; | |
367 xinerama_x = xinerama_y = 0; | |
368 #ifdef HAVE_XINERAMA | |
369 if (screen >= -1 && XineramaIsActive(mDisplay)) | |
370 { | |
371 XineramaScreenInfo *screens; | |
372 int num_screens; | |
373 | |
374 screens = XineramaQueryScreens(mDisplay, &num_screens); | |
375 if (screen >= num_screens) | |
376 screen = num_screens - 1; | |
377 if (screen == -1) { | |
378 int x = vo_dx + vo_dwidth / 2; | |
379 int y = vo_dy + vo_dheight / 2; | |
380 for (screen = num_screens - 1; screen > 0; screen--) { | |
381 int left = screens[screen].x_org; | |
382 int right = left + screens[screen].width; | |
383 int top = screens[screen].y_org; | |
384 int bottom = top + screens[screen].height; | |
385 if (left <= x && x <= right && top <= y && y <= bottom) | |
386 break; | |
387 } | |
388 } | |
389 if (screen < 0) | |
390 screen = 0; | |
391 vo_screenwidth = screens[screen].width; | |
392 vo_screenheight = screens[screen].height; | |
393 xinerama_x = screens[screen].x_org; | |
394 xinerama_y = screens[screen].y_org; | |
395 | |
396 XFree(screens); | |
397 } | |
18160
03bc3385a845
10l, aspect_save_screenres must be always called in update_xinerama_info.
reimar
parents:
18149
diff
changeset
|
398 #endif |
18116 | 399 aspect_save_screenres(vo_screenwidth, vo_screenheight); |
400 } | |
401 | |
12582 | 402 int vo_init(void) |
32 | 403 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
404 // int mScreen; |
12582 | 405 int depth, bpp; |
406 unsigned int mask; | |
407 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
408 // 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
|
409 // Display * mDisplay; |
12582 | 410 XImage *mXImage = NULL; |
411 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
412 // Window mRootWin; |
12582 | 413 XWindowAttributes attribs; |
414 char *dispName; | |
12972
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
415 |
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
416 if (vo_rootwin) |
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
417 WinID = 0; // use root win |
32 | 418 |
12582 | 419 if (vo_depthonscreen) |
13935 | 420 { |
421 saver_off(mDisplay); | |
12582 | 422 return 1; // already called |
13935 | 423 } |
32 | 424 |
12582 | 425 XSetErrorHandler(x11_errorhandler); |
4812 | 426 |
427 #if 0 | |
12582 | 428 if (!mDisplayName) |
429 if (!(mDisplayName = getenv("DISPLAY"))) | |
430 mDisplayName = strdup(":0.0"); | |
4812 | 431 #else |
12582 | 432 dispName = XDisplayName(mDisplayName); |
4812 | 433 #endif |
434 | |
12582 | 435 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
|
436 |
12582 | 437 mDisplay = XOpenDisplay(dispName); |
438 if (!mDisplay) | |
439 { | |
440 mp_msg(MSGT_VO, MSGL_ERR, | |
441 "vo: couldn't open the X11 display (%s)!\n", dispName); | |
442 return 0; | |
443 } | |
444 mScreen = DefaultScreen(mDisplay); // Screen ID. | |
445 mRootWin = RootWindow(mDisplay, mScreen); // Root window ID. | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
446 |
12582 | 447 init_atoms(); |
448 | |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
449 #ifdef HAVE_XF86VM |
12582 | 450 { |
451 int clock; | |
452 | |
453 XF86VidModeGetModeLine(mDisplay, mScreen, &clock, &modeline); | |
454 if (!vo_screenwidth) | |
455 vo_screenwidth = modeline.hdisplay; | |
456 if (!vo_screenheight) | |
457 vo_screenheight = modeline.vdisplay; | |
458 } | |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
459 #endif |
12582 | 460 { |
461 if (!vo_screenwidth) | |
462 vo_screenwidth = DisplayWidth(mDisplay, mScreen); | |
463 if (!vo_screenheight) | |
464 vo_screenheight = DisplayHeight(mDisplay, mScreen); | |
465 } | |
466 // get color depth (from root window, or the best visual): | |
467 XGetWindowAttributes(mDisplay, mRootWin, &attribs); | |
468 depth = attribs.depth; | |
1732 | 469 |
12582 | 470 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) |
471 { | |
472 Visual *visual; | |
473 | |
474 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); | |
475 if (depth != -1) | |
476 mXImage = XCreateImage(mDisplay, visual, depth, ZPixmap, | |
477 0, NULL, 1, 1, 8, 1); | |
478 } else | |
479 mXImage = | |
480 XGetImage(mDisplay, mRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap); | |
1732 | 481 |
12582 | 482 vo_depthonscreen = depth; // display depth on screen |
1732 | 483 |
12582 | 484 // get bits/pixel from XImage structure: |
485 if (mXImage == NULL) | |
486 { | |
487 mask = 0; | |
488 } else | |
489 { | |
490 /* | |
491 * for the depth==24 case, the XImage structures might use | |
492 * 24 or 32 bits of data per pixel. The global variable | |
493 * vo_depthonscreen stores the amount of data per pixel in the | |
494 * XImage structure! | |
495 * | |
496 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp? | |
497 */ | |
498 bpp = mXImage->bits_per_pixel; | |
499 if ((vo_depthonscreen + 7) / 8 != (bpp + 7) / 8) | |
500 vo_depthonscreen = bpp; // by A'rpi | |
501 mask = | |
502 mXImage->red_mask | mXImage->green_mask | mXImage->blue_mask; | |
503 mp_msg(MSGT_VO, MSGL_V, | |
504 "vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", mask, | |
505 mXImage->red_mask, mXImage->green_mask, mXImage->blue_mask); | |
506 XDestroyImage(mXImage); | |
507 } | |
508 if (((vo_depthonscreen + 7) / 8) == 2) | |
509 { | |
510 if (mask == 0x7FFF) | |
511 vo_depthonscreen = 15; | |
512 else if (mask == 0xFFFF) | |
513 vo_depthonscreen = 16; | |
514 } | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
515 // XCloseDisplay( mDisplay ); |
1447
e82fbd67ae60
better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents:
1415
diff
changeset
|
516 /* slightly improved local display detection AST */ |
12582 | 517 if (strncmp(dispName, "unix:", 5) == 0) |
518 dispName += 4; | |
519 else if (strncmp(dispName, "localhost:", 10) == 0) | |
520 dispName += 9; | |
521 if (*dispName == ':' && atoi(dispName + 1) < 10) | |
522 mLocalDisplay = 1; | |
523 else | |
524 mLocalDisplay = 0; | |
16301 | 525 mp_msg(MSGT_VO, MSGL_V, |
12582 | 526 "vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n", |
527 vo_screenwidth, vo_screenheight, depth, vo_depthonscreen, | |
528 dispName, mLocalDisplay ? "local" : "remote"); | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
529 |
12582 | 530 vo_wm_type = vo_wm_detect(); |
531 | |
532 vo_fs_type = vo_x11_get_fs_type(vo_wm_type); | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
533 |
12582 | 534 fstype_dump(vo_fs_type); |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
535 |
12582 | 536 saver_off(mDisplay); |
537 return 1; | |
32 | 538 } |
539 | |
12582 | 540 void vo_uninit(void) |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
541 { |
12582 | 542 if (!mDisplay) |
543 { | |
544 mp_msg(MSGT_VO, MSGL_V, | |
545 "vo: x11 uninit called but X11 not inited..\n"); | |
546 return; | |
547 } | |
6077 | 548 // if( !vo_depthonscreen ) return; |
12582 | 549 mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n"); |
550 XSetErrorHandler(NULL); | |
551 XCloseDisplay(mDisplay); | |
552 vo_depthonscreen = 0; | |
553 mDisplay = NULL; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
554 } |
4436 | 555 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
556 #include "osdep/keycodes.h" |
32 | 557 #include "wskeys.h" |
558 | |
559 extern void mplayer_put_key(int code); | |
560 | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
561 #ifdef XF86XK_AudioPause |
18950 | 562 static void vo_x11_putkey_ext(int keysym) |
12582 | 563 { |
564 switch (keysym) | |
565 { | |
566 case XF86XK_AudioPause: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
567 mplayer_put_key(KEY_PAUSE); |
12582 | 568 break; |
569 case XF86XK_AudioStop: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
570 mplayer_put_key(KEY_STOP); |
12582 | 571 break; |
572 case XF86XK_AudioPrev: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
573 mplayer_put_key(KEY_PREV); |
12582 | 574 break; |
575 case XF86XK_AudioNext: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
576 mplayer_put_key(KEY_NEXT); |
12582 | 577 break; |
578 default: | |
579 break; | |
580 } | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
581 } |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
582 #endif |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
583 |
12582 | 584 void vo_x11_putkey(int key) |
585 { | |
586 switch (key) | |
587 { | |
588 case wsLeft: | |
589 mplayer_put_key(KEY_LEFT); | |
590 break; | |
591 case wsRight: | |
592 mplayer_put_key(KEY_RIGHT); | |
593 break; | |
594 case wsUp: | |
595 mplayer_put_key(KEY_UP); | |
596 break; | |
597 case wsDown: | |
598 mplayer_put_key(KEY_DOWN); | |
599 break; | |
600 case wsSpace: | |
601 mplayer_put_key(' '); | |
602 break; | |
603 case wsEscape: | |
604 mplayer_put_key(KEY_ESC); | |
605 break; | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
606 case wsTab: |
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
607 mplayer_put_key(KEY_TAB); |
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
608 break; |
12582 | 609 case wsEnter: |
610 mplayer_put_key(KEY_ENTER); | |
611 break; | |
612 case wsBackSpace: | |
613 mplayer_put_key(KEY_BS); | |
614 break; | |
615 case wsDelete: | |
616 mplayer_put_key(KEY_DELETE); | |
617 break; | |
618 case wsInsert: | |
619 mplayer_put_key(KEY_INSERT); | |
620 break; | |
621 case wsHome: | |
622 mplayer_put_key(KEY_HOME); | |
623 break; | |
624 case wsEnd: | |
625 mplayer_put_key(KEY_END); | |
626 break; | |
627 case wsPageUp: | |
628 mplayer_put_key(KEY_PAGE_UP); | |
629 break; | |
630 case wsPageDown: | |
631 mplayer_put_key(KEY_PAGE_DOWN); | |
632 break; | |
633 case wsF1: | |
634 mplayer_put_key(KEY_F + 1); | |
635 break; | |
636 case wsF2: | |
637 mplayer_put_key(KEY_F + 2); | |
638 break; | |
639 case wsF3: | |
640 mplayer_put_key(KEY_F + 3); | |
641 break; | |
642 case wsF4: | |
643 mplayer_put_key(KEY_F + 4); | |
644 break; | |
645 case wsF5: | |
646 mplayer_put_key(KEY_F + 5); | |
647 break; | |
648 case wsF6: | |
649 mplayer_put_key(KEY_F + 6); | |
650 break; | |
651 case wsF7: | |
652 mplayer_put_key(KEY_F + 7); | |
653 break; | |
654 case wsF8: | |
655 mplayer_put_key(KEY_F + 8); | |
656 break; | |
657 case wsF9: | |
658 mplayer_put_key(KEY_F + 9); | |
659 break; | |
660 case wsF10: | |
661 mplayer_put_key(KEY_F + 10); | |
662 break; | |
663 case wsF11: | |
664 mplayer_put_key(KEY_F + 11); | |
665 break; | |
666 case wsF12: | |
667 mplayer_put_key(KEY_F + 12); | |
668 break; | |
669 case wsMinus: | |
670 case wsGrayMinus: | |
671 mplayer_put_key('-'); | |
672 break; | |
673 case wsPlus: | |
674 case wsGrayPlus: | |
675 mplayer_put_key('+'); | |
676 break; | |
677 case wsGrayMul: | |
678 case wsMul: | |
679 mplayer_put_key('*'); | |
680 break; | |
681 case wsGrayDiv: | |
682 case wsDiv: | |
683 mplayer_put_key('/'); | |
684 break; | |
685 case wsLess: | |
686 mplayer_put_key('<'); | |
687 break; | |
688 case wsMore: | |
689 mplayer_put_key('>'); | |
690 break; | |
691 case wsGray0: | |
692 mplayer_put_key(KEY_KP0); | |
693 break; | |
694 case wsGrayEnd: | |
695 case wsGray1: | |
696 mplayer_put_key(KEY_KP1); | |
697 break; | |
698 case wsGrayDown: | |
699 case wsGray2: | |
700 mplayer_put_key(KEY_KP2); | |
701 break; | |
702 case wsGrayPgDn: | |
703 case wsGray3: | |
704 mplayer_put_key(KEY_KP3); | |
705 break; | |
706 case wsGrayLeft: | |
707 case wsGray4: | |
708 mplayer_put_key(KEY_KP4); | |
709 break; | |
710 case wsGray5Dup: | |
711 case wsGray5: | |
712 mplayer_put_key(KEY_KP5); | |
713 break; | |
714 case wsGrayRight: | |
715 case wsGray6: | |
716 mplayer_put_key(KEY_KP6); | |
717 break; | |
718 case wsGrayHome: | |
719 case wsGray7: | |
720 mplayer_put_key(KEY_KP7); | |
721 break; | |
722 case wsGrayUp: | |
723 case wsGray8: | |
724 mplayer_put_key(KEY_KP8); | |
725 break; | |
726 case wsGrayPgUp: | |
727 case wsGray9: | |
728 mplayer_put_key(KEY_KP9); | |
729 break; | |
730 case wsGrayDecimal: | |
731 mplayer_put_key(KEY_KPDEC); | |
732 break; | |
733 case wsGrayInsert: | |
734 mplayer_put_key(KEY_KPINS); | |
735 break; | |
736 case wsGrayDelete: | |
737 mplayer_put_key(KEY_KPDEL); | |
738 break; | |
739 case wsGrayEnter: | |
740 mplayer_put_key(KEY_KPENTER); | |
741 break; | |
742 case wsGrave: | |
743 mplayer_put_key('`'); | |
744 break; | |
745 case wsTilde: | |
746 mplayer_put_key('~'); | |
747 break; | |
748 case wsExclSign: | |
749 mplayer_put_key('!'); | |
750 break; | |
751 case wsAt: | |
752 mplayer_put_key('@'); | |
753 break; | |
754 case wsHash: | |
755 mplayer_put_key('#'); | |
756 break; | |
757 case wsDollar: | |
758 mplayer_put_key('$'); | |
759 break; | |
760 case wsPercent: | |
761 mplayer_put_key('%'); | |
762 break; | |
763 case wsCircumflex: | |
764 mplayer_put_key('^'); | |
765 break; | |
766 case wsAmpersand: | |
767 mplayer_put_key('&'); | |
768 break; | |
769 case wsobracket: | |
770 mplayer_put_key('('); | |
771 break; | |
772 case wscbracket: | |
773 mplayer_put_key(')'); | |
774 break; | |
775 case wsUnder: | |
776 mplayer_put_key('_'); | |
777 break; | |
778 case wsocbracket: | |
779 mplayer_put_key('{'); | |
780 break; | |
781 case wsccbracket: | |
782 mplayer_put_key('}'); | |
783 break; | |
784 case wsColon: | |
785 mplayer_put_key(':'); | |
786 break; | |
787 case wsSemicolon: | |
788 mplayer_put_key(';'); | |
789 break; | |
790 case wsDblQuote: | |
791 mplayer_put_key('\"'); | |
792 break; | |
793 case wsAcute: | |
794 mplayer_put_key('\''); | |
795 break; | |
796 case wsComma: | |
797 mplayer_put_key(','); | |
798 break; | |
799 case wsPoint: | |
800 mplayer_put_key('.'); | |
801 break; | |
802 case wsQuestSign: | |
803 mplayer_put_key('?'); | |
804 break; | |
805 case wsBSlash: | |
806 mplayer_put_key('\\'); | |
807 break; | |
808 case wsPipe: | |
809 mplayer_put_key('|'); | |
810 break; | |
811 case wsEqual: | |
812 mplayer_put_key('='); | |
813 break; | |
814 case wsosbrackets: | |
815 mplayer_put_key('['); | |
816 break; | |
817 case wscsbrackets: | |
818 mplayer_put_key(']'); | |
819 break; | |
10936
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
820 |
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
821 |
12582 | 822 default: |
823 if ((key >= 'a' && key <= 'z') || (key >= 'A' && key <= 'Z') || | |
824 (key >= '0' && key <= '9')) | |
825 mplayer_put_key(key); | |
826 } | |
369 | 827 |
32 | 828 } |
829 | |
830 | |
831 // ----- Motif header: ------- | |
832 | |
1236 | 833 #define MWM_HINTS_FUNCTIONS (1L << 0) |
834 #define MWM_HINTS_DECORATIONS (1L << 1) | |
835 #define MWM_HINTS_INPUT_MODE (1L << 2) | |
836 #define MWM_HINTS_STATUS (1L << 3) | |
837 | |
838 #define MWM_FUNC_ALL (1L << 0) | |
839 #define MWM_FUNC_RESIZE (1L << 1) | |
840 #define MWM_FUNC_MOVE (1L << 2) | |
841 #define MWM_FUNC_MINIMIZE (1L << 3) | |
842 #define MWM_FUNC_MAXIMIZE (1L << 4) | |
843 #define MWM_FUNC_CLOSE (1L << 5) | |
844 | |
845 #define MWM_DECOR_ALL (1L << 0) | |
846 #define MWM_DECOR_BORDER (1L << 1) | |
847 #define MWM_DECOR_RESIZEH (1L << 2) | |
848 #define MWM_DECOR_TITLE (1L << 3) | |
849 #define MWM_DECOR_MENU (1L << 4) | |
850 #define MWM_DECOR_MINIMIZE (1L << 5) | |
851 #define MWM_DECOR_MAXIMIZE (1L << 6) | |
852 | |
853 #define MWM_INPUT_MODELESS 0 | |
854 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 | |
855 #define MWM_INPUT_SYSTEM_MODAL 2 | |
856 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 | |
857 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL | |
858 | |
859 #define MWM_TEAROFF_WINDOW (1L<<0) | |
32 | 860 |
861 typedef struct | |
862 { | |
12582 | 863 long flags; |
864 long functions; | |
865 long decorations; | |
866 long input_mode; | |
867 long state; | |
32 | 868 } MotifWmHints; |
869 | |
12582 | 870 static MotifWmHints vo_MotifWmHints; |
871 static Atom vo_MotifHints = None; | |
32 | 872 |
12582 | 873 void vo_x11_decoration(Display * vo_Display, Window w, int d) |
32 | 874 { |
12582 | 875 static unsigned int olddecor = MWM_DECOR_ALL; |
876 static unsigned int oldfuncs = | |
877 MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | | |
878 MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; | |
879 Atom mtype; | |
880 int mformat; | |
881 unsigned long mn, mb; | |
882 | |
883 if (!WinID) | |
884 return; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
885 |
12582 | 886 if (vo_fsmode & 8) |
887 { | |
888 XSetTransientForHint(vo_Display, w, | |
889 RootWindow(vo_Display, mScreen)); | |
890 } | |
891 | |
892 vo_MotifHints = XInternAtom(vo_Display, "_MOTIF_WM_HINTS", 0); | |
893 if (vo_MotifHints != None) | |
894 { | |
895 if (!d) | |
896 { | |
897 MotifWmHints *mhints = NULL; | |
1415 | 898 |
12582 | 899 XGetWindowProperty(vo_Display, w, vo_MotifHints, 0, 20, False, |
900 vo_MotifHints, &mtype, &mformat, &mn, | |
901 &mb, (unsigned char **) &mhints); | |
902 if (mhints) | |
903 { | |
904 if (mhints->flags & MWM_HINTS_DECORATIONS) | |
905 olddecor = mhints->decorations; | |
906 if (mhints->flags & MWM_HINTS_FUNCTIONS) | |
907 oldfuncs = mhints->functions; | |
908 XFree(mhints); | |
909 } | |
910 } | |
12096 | 911 |
12582 | 912 memset(&vo_MotifWmHints, 0, sizeof(MotifWmHints)); |
913 vo_MotifWmHints.flags = | |
914 MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; | |
915 if (d) | |
916 { | |
917 vo_MotifWmHints.functions = oldfuncs; | |
918 d = olddecor; | |
919 } | |
4993 | 920 #if 0 |
12582 | 921 vo_MotifWmHints.decorations = |
922 d | ((vo_fsmode & 2) ? 0 : MWM_DECOR_MENU); | |
4993 | 923 #else |
12582 | 924 vo_MotifWmHints.decorations = |
925 d | ((vo_fsmode & 2) ? MWM_DECOR_MENU : 0); | |
4993 | 926 #endif |
12582 | 927 XChangeProperty(vo_Display, w, vo_MotifHints, vo_MotifHints, 32, |
928 PropModeReplace, | |
929 (unsigned char *) &vo_MotifWmHints, | |
930 (vo_fsmode & 4) ? 4 : 5); | |
931 } | |
32 | 932 } |
933 | |
12582 | 934 void vo_x11_classhint(Display * display, Window window, char *name) |
935 { | |
936 XClassHint wmClass; | |
937 pid_t pid = getpid(); | |
938 | |
939 wmClass.res_name = name; | |
940 wmClass.res_class = "MPlayer"; | |
941 XSetClassHint(display, window, &wmClass); | |
942 XChangeProperty(display, window, XA_NET_WM_PID, XA_CARDINAL, 32, | |
943 PropModeReplace, (unsigned char *) &pid, 1); | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
944 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
945 |
12582 | 946 Window vo_window = None; |
947 GC vo_gc = NULL; | |
948 GC f_gc = NULL; | |
4993 | 949 XSizeHints vo_hint; |
4795 | 950 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
951 #ifdef HAVE_NEW_GUI |
12582 | 952 void vo_setwindow(Window w, GC g) |
953 { | |
954 vo_window = w; | |
955 vo_gc = g; | |
956 } | |
723 | 957 #endif |
958 | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17366
diff
changeset
|
959 void vo_x11_uninit(void) |
4437 | 960 { |
7111 | 961 saver_on(mDisplay); |
12582 | 962 if (vo_window != None) |
963 vo_showcursor(mDisplay, vo_window); | |
4742 | 964 |
12582 | 965 if (f_gc) |
966 { | |
967 XFreeGC(mDisplay, f_gc); | |
968 f_gc = NULL; | |
969 } | |
4437 | 970 #ifdef HAVE_NEW_GUI |
971 /* destroy window only if it's not controlled by GUI */ | |
12582 | 972 if (!use_gui) |
4437 | 973 #endif |
974 { | |
12582 | 975 if (vo_gc) |
976 { | |
977 XSetBackground(mDisplay, vo_gc, 0); | |
978 XFreeGC(mDisplay, vo_gc); | |
979 vo_gc = NULL; | |
980 } | |
981 if (vo_window != None) | |
982 { | |
983 XClearWindow(mDisplay, vo_window); | |
984 if (WinID < 0) | |
985 { | |
986 XEvent xev; | |
987 | |
988 XUnmapWindow(mDisplay, vo_window); | |
989 XDestroyWindow(mDisplay, vo_window); | |
990 do | |
991 { | |
992 XNextEvent(mDisplay, &xev); | |
993 } | |
994 while (xev.type != DestroyNotify | |
995 || xev.xdestroywindow.event != vo_window); | |
996 } | |
997 vo_window = None; | |
998 } | |
999 vo_fs = 0; | |
1000 vo_old_width = vo_old_height = 0; | |
4437 | 1001 } |
1002 } | |
1003 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1004 static unsigned int mouse_timer; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1005 static int mouse_waiting_hide; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
1006 |
12582 | 1007 int vo_x11_check_events(Display * mydisplay) |
1008 { | |
1009 int ret = 0; | |
1010 XEvent Event; | |
1011 char buf[100]; | |
1012 KeySym keySym; | |
1013 static XComposeStatus stat; | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
1014 |
32 | 1015 // unsigned long vo_KeyTable[512]; |
1016 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1017 if ((vo_mouse_autohide) && mouse_waiting_hide && |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1018 (GetTimerMS() - mouse_timer >= 1000)) { |
12582 | 1019 vo_hidecursor(mydisplay, vo_window); |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1020 mouse_waiting_hide = 0; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1021 } |
6095 | 1022 |
12582 | 1023 while (XPending(mydisplay)) |
1024 { | |
1025 XNextEvent(mydisplay, &Event); | |
1026 #ifdef HAVE_NEW_GUI | |
1027 if (use_gui) | |
1028 { | |
1029 guiGetEvent(0, (char *) &Event); | |
1030 if (vo_window != Event.xany.window) | |
1031 continue; | |
1032 } | |
1033 #endif | |
6095 | 1034 // printf("\rEvent.type=%X \n",Event.type); |
12582 | 1035 switch (Event.type) |
1036 { | |
1037 case Expose: | |
1038 ret |= VO_EVENT_EXPOSE; | |
1039 break; | |
1040 case ConfigureNotify: | |
1041 // if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break; | |
1042 // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break; | |
1043 if (vo_window == None) | |
1044 break; | |
1045 vo_dwidth = Event.xconfigure.width; | |
1046 vo_dheight = Event.xconfigure.height; | |
4812 | 1047 #if 0 |
12582 | 1048 /* when resizing, x and y are zero :( */ |
1049 vo_dx = Event.xconfigure.x; | |
1050 vo_dy = Event.xconfigure.y; | |
4812 | 1051 #else |
12582 | 1052 { |
1053 Window root; | |
1054 int foo; | |
1055 Window win; | |
1056 | |
1057 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, | |
1058 &foo /*width */ , &foo /*height */ , &foo, | |
1059 &foo); | |
1060 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, | |
1061 &vo_dx, &vo_dy, &win); | |
1062 } | |
1063 #endif | |
1064 ret |= VO_EVENT_RESIZE; | |
1065 break; | |
1066 case KeyPress: | |
1067 { | |
1068 int key; | |
1069 | |
14001 | 1070 #ifdef HAVE_NEW_GUI |
1071 if ( use_gui ) { break; } | |
1072 #endif | |
1073 | |
12582 | 1074 XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, |
1075 &stat); | |
1076 #ifdef XF86XK_AudioPause | |
1077 vo_x11_putkey_ext(keySym); | |
1078 #endif | |
1079 key = | |
1080 ((keySym & 0xff00) != | |
1081 0 ? ((keySym & 0x00ff) + 256) : (keySym)); | |
1082 vo_x11_putkey(key); | |
1083 ret |= VO_EVENT_KEYPRESS; | |
1084 } | |
1085 break; | |
1086 case MotionNotify: | |
19850
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1087 if(enable_mouse_movements) |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1088 { |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1089 char cmd_str[40]; |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1090 sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y); |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1091 mp_input_queue_cmd(mp_input_parse_cmd(cmd_str)); |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1092 } |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1093 |
12582 | 1094 if (vo_mouse_autohide) |
1095 { | |
1096 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1097 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1098 mouse_timer = GetTimerMS(); |
12582 | 1099 } |
1100 break; | |
1101 case ButtonPress: | |
1102 if (vo_mouse_autohide) | |
1103 { | |
1104 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1105 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1106 mouse_timer = GetTimerMS(); |
12582 | 1107 } |
1108 // Ignore mouse whell press event | |
1109 if (Event.xbutton.button > 3) | |
1110 { | |
1111 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
1112 break; | |
1113 } | |
1114 #ifdef HAVE_NEW_GUI | |
1115 // Ignor mouse button 1 - 3 under gui | |
1116 if (use_gui && (Event.xbutton.button >= 1) | |
1117 && (Event.xbutton.button <= 3)) | |
1118 break; | |
1119 #endif | |
1120 mplayer_put_key((MOUSE_BTN0 + Event.xbutton.button - | |
1121 1) | MP_KEY_DOWN); | |
1122 break; | |
1123 case ButtonRelease: | |
1124 if (vo_mouse_autohide) | |
1125 { | |
1126 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1127 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1128 mouse_timer = GetTimerMS(); |
12582 | 1129 } |
1130 #ifdef HAVE_NEW_GUI | |
1131 // Ignor mouse button 1 - 3 under gui | |
1132 if (use_gui && (Event.xbutton.button >= 1) | |
1133 && (Event.xbutton.button <= 3)) | |
1134 break; | |
1135 #endif | |
1136 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
1137 break; | |
1138 case PropertyNotify: | |
1139 { | |
1140 char *name = | |
1141 XGetAtomName(mydisplay, Event.xproperty.atom); | |
1142 | |
1143 if (!name) | |
1144 break; | |
1145 | |
6046 | 1146 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); |
12582 | 1147 |
1148 XFree(name); | |
1149 } | |
1150 break; | |
1151 case MapNotify: | |
1152 vo_hint.win_gravity = old_gravity; | |
1153 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
1154 vo_fs_flip = 0; | |
1155 break; | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1156 case ClientMessage: |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1157 if (Event.xclient.message_type == XAWM_PROTOCOLS && |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1158 Event.xclient.data.l[0] == XAWM_DELETE_WINDOW) |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1159 mplayer_put_key(KEY_CLOSE_WIN); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1160 break; |
12582 | 1161 } |
1162 } | |
1163 return ret; | |
32 | 1164 } |
1165 | |
13843 | 1166 /** |
1167 * \brief sets the size and position of the non-fullscreen window. | |
1168 */ | |
1169 void vo_x11_nofs_sizepos(int x, int y, int width, int height) | |
1170 { | |
1171 if (vo_fs) { | |
1172 vo_old_x = x; | |
1173 vo_old_y = y; | |
1174 vo_old_width = width; | |
1175 vo_old_height = height; | |
1176 } | |
1177 else | |
13871 | 1178 { |
1179 vo_dwidth = width; | |
1180 vo_dheight = height; | |
13843 | 1181 XMoveResizeWindow(mDisplay, vo_window, x, y, width, height); |
13871 | 1182 } |
13843 | 1183 } |
1184 | |
12582 | 1185 void vo_x11_sizehint(int x, int y, int width, int height, int max) |
4993 | 1186 { |
12582 | 1187 vo_hint.flags = PPosition | PSize | PWinGravity; |
1188 if (vo_keepaspect) | |
1189 { | |
1190 vo_hint.flags |= PAspect; | |
1191 vo_hint.min_aspect.x = width; | |
1192 vo_hint.min_aspect.y = height; | |
1193 vo_hint.max_aspect.x = width; | |
1194 vo_hint.max_aspect.y = height; | |
1195 } | |
8692
604f0cde816c
X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents:
8676
diff
changeset
|
1196 |
12582 | 1197 vo_hint.x = x; |
1198 vo_hint.y = y; | |
1199 vo_hint.width = width; | |
1200 vo_hint.height = height; | |
1201 if (max) | |
1202 { | |
1203 vo_hint.max_width = width; | |
1204 vo_hint.max_height = height; | |
1205 vo_hint.flags |= PMaxSize; | |
1206 } else | |
1207 { | |
1208 vo_hint.max_width = 0; | |
1209 vo_hint.max_height = 0; | |
1210 } | |
11995 | 1211 |
12582 | 1212 // set min height/width to 4 to avoid off by one errors |
1213 // and because mga_vid requires a minial size of 4 pixel | |
1214 vo_hint.min_width = vo_hint.min_height = 4; | |
1215 vo_hint.flags |= PMinSize; | |
11995 | 1216 |
12582 | 1217 vo_hint.win_gravity = StaticGravity; |
1218 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
4993 | 1219 } |
1220 | |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1221 static int vo_x11_get_gnome_layer(Display * mDisplay, Window win) |
8866 | 1222 { |
12582 | 1223 Atom type; |
1224 int format; | |
1225 unsigned long nitems; | |
1226 unsigned long bytesafter; | |
1227 unsigned short *args = NULL; | |
8866 | 1228 |
12582 | 1229 if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384, |
1230 False, AnyPropertyType, &type, &format, &nitems, | |
1231 &bytesafter, | |
1232 (unsigned char **) &args) == Success | |
1233 && nitems > 0 && args) | |
1234 { | |
1235 mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n", | |
1236 *args); | |
1237 return *args; | |
1238 } | |
1239 return WIN_LAYER_NORMAL; | |
8866 | 1240 } |
1241 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1242 // |
12582 | 1243 Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot, |
1244 Visual * vis, int x, int y, | |
1245 unsigned int width, unsigned int height, | |
1246 int depth, Colormap col_map) | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1247 { |
12582 | 1248 unsigned long xswamask = CWBackingStore | CWBorderPixel; |
1249 XSetWindowAttributes xswa; | |
1250 Window ret_win; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1251 |
12582 | 1252 if (col_map != CopyFromParent) |
1253 { | |
1254 xswa.colormap = col_map; | |
1255 xswamask |= CWColormap; | |
1256 } | |
1257 xswa.background_pixel = 0; | |
1258 xswa.border_pixel = 0; | |
1259 xswa.backing_store = Always; | |
1260 xswa.bit_gravity = StaticGravity; | |
1261 | |
1262 ret_win = | |
1263 XCreateWindow(mDisplay, mRootWin, x, y, width, height, 0, depth, | |
1264 CopyFromParent, vis, xswamask, &xswa); | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1265 XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1); |
12582 | 1266 if (!f_gc) |
1267 f_gc = XCreateGC(mDisplay, ret_win, 0, 0); | |
1268 XSetForeground(mDisplay, f_gc, 0); | |
1269 | |
1270 return ret_win; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1271 } |
12582 | 1272 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1273 |
12582 | 1274 void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window, |
1275 int img_width, int img_height, int use_fs) | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1276 { |
12582 | 1277 int u_dheight, u_dwidth, left_ov, left_ov2; |
10765
c8fb7e2690a3
10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents:
10757
diff
changeset
|
1278 |
12582 | 1279 if (!f_gc) |
1280 return; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1281 |
12582 | 1282 u_dheight = use_fs ? vo_screenheight : vo_dheight; |
1283 u_dwidth = use_fs ? vo_screenwidth : vo_dwidth; | |
1284 if ((u_dheight <= img_height) && (u_dwidth <= img_width)) | |
1285 return; | |
10765
c8fb7e2690a3
10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents:
10757
diff
changeset
|
1286 |
12582 | 1287 left_ov = (u_dheight - img_height) / 2; |
1288 left_ov2 = (u_dwidth - img_width) / 2; | |
1289 | |
1290 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov); | |
1291 XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1, | |
1292 u_dwidth, left_ov + 1); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1293 |
12582 | 1294 if (u_dwidth > img_width) |
1295 { | |
1296 XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2, | |
1297 img_height); | |
1298 XFillRectangle(mDisplay, vo_window, f_gc, u_dwidth - left_ov2 - 1, | |
1299 left_ov, left_ov2, img_height); | |
1300 } | |
1301 | |
1302 XFlush(mDisplay); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1303 } |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1304 |
12582 | 1305 void vo_x11_clearwindow(Display * mDisplay, Window vo_window) |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1306 { |
12582 | 1307 if (!f_gc) |
1308 return; | |
1309 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth, | |
1310 vo_screenheight); | |
1311 // | |
1312 XFlush(mDisplay); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1313 } |
12582 | 1314 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1315 |
12582 | 1316 void vo_x11_setlayer(Display * mDisplay, Window vo_window, int layer) |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1317 { |
12582 | 1318 if (WinID >= 0) |
1319 return; | |
8864 | 1320 |
12582 | 1321 if (vo_fs_type & vo_wm_LAYER) |
1322 { | |
1323 XClientMessageEvent xev; | |
1324 | |
1325 if (!orig_layer) | |
1326 orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window); | |
8866 | 1327 |
12582 | 1328 memset(&xev, 0, sizeof(xev)); |
1329 xev.type = ClientMessage; | |
1330 xev.display = mDisplay; | |
1331 xev.window = vo_window; | |
1332 xev.message_type = XA_WIN_LAYER; | |
1333 xev.format = 32; | |
1334 xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer | |
1335 xev.data.l[1] = CurrentTime; | |
1336 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1337 "[x11] Layered style stay on top (layer %ld).\n", |
12582 | 1338 xev.data.l[0]); |
1339 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, | |
1340 (XEvent *) & xev); | |
1341 } else if (vo_fs_type & vo_wm_NETWM) | |
1342 { | |
1343 XClientMessageEvent xev; | |
1344 char *state; | |
8645 | 1345 |
12582 | 1346 memset(&xev, 0, sizeof(xev)); |
1347 xev.type = ClientMessage; | |
1348 xev.message_type = XA_NET_WM_STATE; | |
1349 xev.display = mDisplay; | |
1350 xev.window = vo_window; | |
1351 xev.format = 32; | |
1352 xev.data.l[0] = layer; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1353 |
12582 | 1354 if (vo_fs_type & vo_wm_STAYS_ON_TOP) |
1355 xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP; | |
1356 else if (vo_fs_type & vo_wm_ABOVE) | |
1357 xev.data.l[1] = XA_NET_WM_STATE_ABOVE; | |
1358 else if (vo_fs_type & vo_wm_FULLSCREEN) | |
1359 xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN; | |
1360 else if (vo_fs_type & vo_wm_BELOW) | |
1361 // This is not fallback. We can safely assume that situation where | |
1362 // only NETWM_STATE_BELOW is supported and others not, doesn't exist. | |
1363 xev.data.l[1] = XA_NET_WM_STATE_BELOW; | |
1364 | |
1365 XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask, | |
1366 (XEvent *) & xev); | |
1367 state = XGetAtomName(mDisplay, xev.data.l[1]); | |
1368 mp_msg(MSGT_VO, MSGL_V, | |
1369 "[x11] NET style stay on top (layer %d). Using state %s.\n", | |
1370 layer, state); | |
1371 XFree(state); | |
1372 } | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1373 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1374 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1375 static int vo_x11_get_fs_type(int supported) |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1376 { |
12582 | 1377 int i; |
1378 int type = supported; | |
1379 | |
1380 if (vo_fstype_list) | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1381 { |
12582 | 1382 i = 0; |
1383 for (i = 0; vo_fstype_list[i]; i++) | |
1384 { | |
1385 int neg = 0; | |
1386 char *arg = vo_fstype_list[i]; | |
1387 | |
1388 if (vo_fstype_list[i][0] == '-') | |
1389 { | |
1390 neg = 1; | |
1391 arg = vo_fstype_list[i] + 1; | |
1392 } | |
1393 | |
1394 if (!strncmp(arg, "layer", 5)) | |
1395 { | |
1396 if (!neg && (arg[5] == '=')) | |
1397 { | |
1398 char *endptr = NULL; | |
1399 int layer = strtol(vo_fstype_list[i] + 6, &endptr, 10); | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1400 |
12582 | 1401 if (endptr && *endptr == '\0' && layer >= 0 |
1402 && layer <= 15) | |
1403 fs_layer = layer; | |
1404 } | |
1405 if (neg) | |
1406 type &= ~vo_wm_LAYER; | |
1407 else | |
1408 type |= vo_wm_LAYER; | |
1409 } else if (!strcmp(arg, "above")) | |
1410 { | |
1411 if (neg) | |
1412 type &= ~vo_wm_ABOVE; | |
1413 else | |
1414 type |= vo_wm_ABOVE; | |
1415 } else if (!strcmp(arg, "fullscreen")) | |
1416 { | |
1417 if (neg) | |
1418 type &= ~vo_wm_FULLSCREEN; | |
1419 else | |
1420 type |= vo_wm_FULLSCREEN; | |
1421 } else if (!strcmp(arg, "stays_on_top")) | |
1422 { | |
1423 if (neg) | |
1424 type &= ~vo_wm_STAYS_ON_TOP; | |
1425 else | |
1426 type |= vo_wm_STAYS_ON_TOP; | |
1427 } else if (!strcmp(arg, "below")) | |
1428 { | |
1429 if (neg) | |
1430 type &= ~vo_wm_BELOW; | |
1431 else | |
1432 type |= vo_wm_BELOW; | |
1433 } else if (!strcmp(arg, "netwm")) | |
1434 { | |
1435 if (neg) | |
1436 type &= ~vo_wm_NETWM; | |
1437 else | |
1438 type |= vo_wm_NETWM; | |
1439 } else if (!strcmp(arg, "none")) | |
1440 return 0; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1441 } |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1442 } |
5919 | 1443 |
12582 | 1444 return type; |
4981 | 1445 } |
1446 | |
12582 | 1447 void vo_x11_fullscreen(void) |
11542 | 1448 { |
12582 | 1449 int x, y, w, h; |
1450 | |
1451 if (WinID >= 0 || vo_fs_flip) | |
1452 return; | |
1453 | |
1454 if (vo_fs) | |
1455 { | |
1456 // fs->win | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1457 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1458 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1459 if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1460 return; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1461 x = vo_old_x; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1462 y = vo_old_y; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1463 w = vo_old_width; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1464 h = vo_old_height; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1465 } |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1466 |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1467 vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE); // removes fullscreen state if wm supports EWMH |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1468 vo_fs = VO_FALSE; |
12582 | 1469 } else |
1470 { | |
1471 // win->fs | |
1472 vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH | |
1473 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1474 vo_fs = VO_TRUE; |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1475 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1476 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1477 if (vo_old_width && |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1478 (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) && |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1479 (vo_dheight == vo_screenheight && vo_dheight != vo_old_height)) |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1480 return; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1481 vo_old_x = vo_dx; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1482 vo_old_y = vo_dy; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1483 vo_old_width = vo_dwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1484 vo_old_height = vo_dheight; |
18116 | 1485 update_xinerama_info(); |
1486 x = xinerama_x; | |
1487 y = xinerama_y; | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1488 w = vo_screenwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1489 h = vo_screenheight; |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1490 } |
12582 | 1491 } |
1492 { | |
1493 long dummy; | |
1494 | |
1495 XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy); | |
1496 if (!(vo_hint.flags & PWinGravity)) | |
1497 old_gravity = NorthWestGravity; | |
1498 else | |
1499 old_gravity = vo_hint.win_gravity; | |
1500 } | |
1501 if (vo_wm_type == 0 && !(vo_fsmode & 16)) | |
1502 { | |
1503 XUnmapWindow(mDisplay, vo_window); // required for MWM | |
1504 XWithdrawWindow(mDisplay, vo_window, mScreen); | |
1505 vo_fs_flip = 1; | |
1506 } | |
1507 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1508 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1509 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1510 vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1511 vo_x11_sizehint(x, y, w, h, 0); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1512 vo_x11_setlayer(mDisplay, vo_window, vo_fs); |
12582 | 1513 |
1514 | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1515 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1516 } |
14244
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1517 /* some WMs lose ontop after fullscreeen */ |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1518 if ((!(vo_fs)) & vo_ontop) |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1519 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1520 |
12582 | 1521 XMapRaised(mDisplay, vo_window); |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1522 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // some WMs change window pos on map |
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1523 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12582 | 1524 XRaiseWindow(mDisplay, vo_window); |
1525 XFlush(mDisplay); | |
1526 } | |
1527 | |
1528 void vo_x11_ontop(void) | |
1529 { | |
1530 vo_ontop = (!(vo_ontop)); | |
1531 | |
1532 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 1533 } |
1534 | |
9695 | 1535 /* |
1536 * XScreensaver stuff | |
1537 */ | |
1538 | |
1539 static int got_badwindow; | |
1540 static XErrorHandler old_handler; | |
1541 | |
12582 | 1542 static int badwindow_handler(Display * dpy, XErrorEvent * error) |
9695 | 1543 { |
1544 if (error->error_code != BadWindow) | |
12582 | 1545 return (*old_handler) (dpy, error); |
9695 | 1546 |
1547 got_badwindow = True; | |
1548 return 0; | |
1549 } | |
1550 | |
12582 | 1551 static Window find_xscreensaver_window(Display * dpy) |
9695 | 1552 { |
1553 int i; | |
1554 Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); | |
1555 Window root2, parent, *kids; | |
1556 Window retval = 0; | |
1557 Atom xs_version; | |
1558 unsigned int nkids = 0; | |
1559 | |
1560 xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); | |
1561 | |
1562 if (!(xs_version != None && | |
1563 XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) && | |
12582 | 1564 kids && nkids)) |
1565 return 0; | |
9695 | 1566 |
1567 old_handler = XSetErrorHandler(badwindow_handler); | |
1568 | |
12582 | 1569 for (i = 0; i < nkids; i++) |
1570 { | |
1571 Atom type; | |
1572 int format; | |
1573 unsigned long nitems, bytesafter; | |
1574 char *v; | |
1575 int status; | |
9695 | 1576 |
1577 got_badwindow = False; | |
12582 | 1578 status = |
1579 XGetWindowProperty(dpy, kids[i], xs_version, 0, 200, False, | |
1580 XA_STRING, &type, &format, &nitems, | |
1581 &bytesafter, (unsigned char **) &v); | |
1582 XSync(dpy, False); | |
1583 if (got_badwindow) | |
1584 status = BadWindow; | |
9695 | 1585 |
12582 | 1586 if (status == Success && type != None) |
1587 { | |
1588 retval = kids[i]; | |
1589 break; | |
1590 } | |
9695 | 1591 } |
1592 XFree(kids); | |
1593 XSetErrorHandler(old_handler); | |
1594 | |
1595 return retval; | |
1596 } | |
1597 | |
1598 static Window xs_windowid = 0; | |
1599 static Atom deactivate; | |
1600 static Atom screensaver; | |
1601 | |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1602 static unsigned int time_last; |
9695 | 1603 |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1604 void xscreensaver_heartbeat(void) |
9695 | 1605 { |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1606 unsigned int time = GetTimerMS(); |
9695 | 1607 XEvent ev; |
1608 | |
18485
b8ec2d53a206
Simplify condition, since both time and time_last are unsigned.
rathann
parents:
18287
diff
changeset
|
1609 if (mDisplay && xs_windowid && (time - time_last) > 30000) |
12582 | 1610 { |
1611 time_last = time; | |
9695 | 1612 |
12582 | 1613 ev.xany.type = ClientMessage; |
1614 ev.xclient.display = mDisplay; | |
1615 ev.xclient.window = xs_windowid; | |
1616 ev.xclient.message_type = screensaver; | |
1617 ev.xclient.format = 32; | |
1618 memset(&ev.xclient.data, 0, sizeof(ev.xclient.data)); | |
1619 ev.xclient.data.l[0] = (long) deactivate; | |
9695 | 1620 |
12582 | 1621 mp_msg(MSGT_VO, MSGL_DBG2, "Pinging xscreensaver.\n"); |
17123
f79b39b07cc3
Don't abort when xscreensaver window isn't available anymore.
al
parents:
17033
diff
changeset
|
1622 old_handler = XSetErrorHandler(badwindow_handler); |
12582 | 1623 XSendEvent(mDisplay, xs_windowid, False, 0L, &ev); |
1624 XSync(mDisplay, False); | |
17123
f79b39b07cc3
Don't abort when xscreensaver window isn't available anymore.
al
parents:
17033
diff
changeset
|
1625 XSetErrorHandler(old_handler); |
9695 | 1626 } |
1627 } | |
1628 | |
12582 | 1629 static void xscreensaver_disable(Display * dpy) |
9695 | 1630 { |
12582 | 1631 mp_msg(MSGT_VO, MSGL_DBG2, "xscreensaver_disable()\n"); |
9695 | 1632 |
1633 xs_windowid = find_xscreensaver_window(dpy); | |
12582 | 1634 if (!xs_windowid) |
1635 { | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16301
diff
changeset
|
1636 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_CouldNotFindXScreenSaver); |
12582 | 1637 return; |
9695 | 1638 } |
12582 | 1639 mp_msg(MSGT_VO, MSGL_INFO, |
17366 | 1640 "xscreensaver_disable: xscreensaver wid=%ld.\n", xs_windowid); |
9695 | 1641 |
1642 deactivate = XInternAtom(dpy, "DEACTIVATE", False); | |
1643 screensaver = XInternAtom(dpy, "SCREENSAVER", False); | |
1644 } | |
1645 | |
1646 static void xscreensaver_enable(void) | |
1647 { | |
1648 xs_windowid = 0; | |
1649 } | |
1650 | |
1651 /* | |
1652 * End of XScreensaver stuff | |
1653 */ | |
1654 | |
12582 | 1655 void saver_on(Display * mDisplay) |
1656 { | |
324 | 1657 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1658 #ifdef HAVE_XDPMS |
324 | 1659 int nothing; |
12582 | 1660 |
324 | 1661 if (dpms_disabled) |
1662 { | |
12582 | 1663 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1664 { | |
1665 if (!DPMSEnable(mDisplay)) | |
1666 { // restoring power saving settings | |
1667 mp_msg(MSGT_VO, MSGL_WARN, "DPMS not available?\n"); | |
1668 } else | |
1669 { | |
741 | 1670 // DPMS does not seem to be enabled unless we call DPMSInfo |
12582 | 1671 BOOL onoff; |
1672 CARD16 state; | |
1673 | |
1674 DPMSForceLevel(mDisplay, DPMSModeOn); | |
1675 DPMSInfo(mDisplay, &state, &onoff); | |
1676 if (onoff) | |
1677 { | |
13946 | 1678 mp_msg(MSGT_VO, MSGL_V, |
12582 | 1679 "Successfully enabled DPMS\n"); |
1680 } else | |
1681 { | |
1682 mp_msg(MSGT_VO, MSGL_WARN, "Could not enable DPMS\n"); | |
741 | 1683 } |
1684 } | |
12582 | 1685 } |
1686 dpms_disabled = 0; | |
324 | 1687 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1688 #endif |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1689 |
324 | 1690 if (timeout_save) |
1691 { | |
12582 | 1692 int dummy, interval, prefer_blank, allow_exp; |
1693 | |
1694 XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, | |
1695 &allow_exp); | |
1696 XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, | |
1697 allow_exp); | |
1698 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, | |
1699 &allow_exp); | |
1700 timeout_save = 0; | |
324 | 1701 } |
1702 | |
12582 | 1703 if (stop_xscreensaver) |
1704 xscreensaver_enable(); | |
1705 if (kdescreensaver_was_running && stop_xscreensaver) | |
1706 { | |
1707 system | |
1708 ("dcop kdesktop KScreensaverIface enable true 2>/dev/null >/dev/null"); | |
1709 kdescreensaver_was_running = 0; | |
8354
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1710 } |
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1711 |
6303 | 1712 |
324 | 1713 } |
1714 | |
12582 | 1715 void saver_off(Display * mDisplay) |
1716 { | |
324 | 1717 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1718 int interval, prefer_blank, allow_exp; |
12582 | 1719 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1720 #ifdef HAVE_XDPMS |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1721 int nothing; |
324 | 1722 |
1723 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) | |
1724 { | |
12582 | 1725 BOOL onoff; |
1726 CARD16 state; | |
1727 | |
1728 DPMSInfo(mDisplay, &state, &onoff); | |
1729 if (onoff) | |
1730 { | |
1731 Status stat; | |
1732 | |
13946 | 1733 mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n"); |
12582 | 1734 dpms_disabled = 1; |
1735 stat = DPMSDisable(mDisplay); // monitor powersave off | |
1736 mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat); | |
1737 } | |
324 | 1738 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1739 #endif |
12582 | 1740 if (!timeout_save) |
1741 { | |
1742 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, | |
1743 &allow_exp); | |
1744 if (timeout_save) | |
1745 XSetScreenSaver(mDisplay, 0, interval, prefer_blank, | |
1746 allow_exp); | |
8097 | 1747 } |
12582 | 1748 // turning off screensaver |
1749 if (stop_xscreensaver) | |
1750 xscreensaver_disable(mDisplay); | |
8354
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1751 if (stop_xscreensaver && !kdescreensaver_was_running) |
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1752 { |
12582 | 1753 kdescreensaver_was_running = |
1754 (system | |
1755 ("dcop kdesktop KScreensaverIface isEnabled 2>/dev/null | sed 's/1/true/g' | grep true 2>/dev/null >/dev/null") | |
1756 == 0); | |
1757 if (kdescreensaver_was_running) | |
1758 system | |
1759 ("dcop kdesktop KScreensaverIface enable false 2>/dev/null >/dev/null"); | |
8354
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1760 } |
326 | 1761 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1762 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1763 static XErrorHandler old_handler = NULL; |
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1764 static int selectinput_err = 0; |
12582 | 1765 static int x11_selectinput_errorhandler(Display * display, |
1766 XErrorEvent * event) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1767 { |
12582 | 1768 if (event->error_code == BadAccess) |
1769 { | |
1770 selectinput_err = 1; | |
1771 mp_msg(MSGT_VO, MSGL_ERR, | |
1772 "X11 error: BadAccess during XSelectInput Call\n"); | |
1773 mp_msg(MSGT_VO, MSGL_ERR, | |
1774 "X11 error: The 'ButtonPressMask' mask of specified window has probably already used by another appication (see man XSelectInput)\n"); | |
1775 /* If you think mplayer should shutdown with this error, comments out following line */ | |
1776 return 0; | |
1777 } | |
1778 if (old_handler != NULL) | |
1779 old_handler(display, event); | |
1780 else | |
1781 x11_errorhandler(display, event); | |
1782 return 0; | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1783 } |
3990 | 1784 |
12582 | 1785 void vo_x11_selectinput_witherr(Display * display, Window w, |
1786 long event_mask) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1787 { |
12582 | 1788 XSync(display, False); |
1789 old_handler = XSetErrorHandler(x11_selectinput_errorhandler); | |
1790 selectinput_err = 0; | |
1791 if (vo_nomouse_input) | |
1792 { | |
1793 XSelectInput(display, w, | |
1794 event_mask & | |
1795 (~(ButtonPressMask | ButtonReleaseMask))); | |
1796 } else | |
1797 { | |
1798 XSelectInput(display, w, event_mask); | |
1799 } | |
1800 XSync(display, False); | |
1801 XSetErrorHandler(old_handler); | |
1802 if (selectinput_err) | |
1803 { | |
1804 mp_msg(MSGT_VO, MSGL_ERR, | |
1805 "X11 error: MPlayer discards mouse control (reconfiguring)\n"); | |
1806 XSelectInput(display, w, | |
1807 event_mask & | |
1808 (~ | |
1809 (ButtonPressMask | ButtonReleaseMask | | |
1810 PointerMotionMask))); | |
1811 } | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1812 } |
3990 | 1813 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1814 #ifdef HAVE_XF86VM |
12582 | 1815 void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width, |
1816 int *modeline_height) | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1817 { |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1818 int vm_event, vm_error; |
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1819 int vm_ver, vm_rev; |
12582 | 1820 int i, j, have_vm = 0; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1821 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1822 int modecount; |
12582 | 1823 |
1824 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) | |
1825 { | |
1826 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
18508 | 1827 mp_msg(MSGT_VO, MSGL_V, "XF86VidMode extension v%i.%i\n", vm_ver, |
12582 | 1828 vm_rev); |
1829 have_vm = 1; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1830 } else |
12582 | 1831 mp_msg(MSGT_VO, MSGL_WARN, |
18508 | 1832 "XF86VidMode extension not available.\n"); |
12582 | 1833 |
1834 if (have_vm) | |
1835 { | |
1836 if (vidmodes == NULL) | |
1837 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1838 &vidmodes); | |
1839 j = 0; | |
1840 *modeline_width = vidmodes[0]->hdisplay; | |
1841 *modeline_height = vidmodes[0]->vdisplay; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1842 |
12582 | 1843 for (i = 1; i < modecount; i++) |
1844 if ((vidmodes[i]->hdisplay >= X) | |
1845 && (vidmodes[i]->vdisplay >= Y)) | |
1846 if ((vidmodes[i]->hdisplay <= *modeline_width) | |
1847 && (vidmodes[i]->vdisplay <= *modeline_height)) | |
1848 { | |
1849 *modeline_width = vidmodes[i]->hdisplay; | |
1850 *modeline_height = vidmodes[i]->vdisplay; | |
1851 j = i; | |
1852 } | |
1853 | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16301
diff
changeset
|
1854 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_SelectedVideoMode, |
12582 | 1855 *modeline_width, *modeline_height, X, Y); |
1856 XF86VidModeLockModeSwitch(mDisplay, mScreen, 0); | |
1857 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1858 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1859 X = (vo_screenwidth - *modeline_width) / 2; | |
1860 Y = (vo_screenheight - *modeline_height) / 2; | |
1861 XF86VidModeSetViewPort(mDisplay, mScreen, X, Y); | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1862 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1863 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1864 |
12582 | 1865 void vo_vm_close(Display * dpy) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1866 { |
12582 | 1867 #ifdef HAVE_NEW_GUI |
1868 if (vidmodes != NULL && vo_window != None) | |
1869 #else | |
1870 if (vidmodes != NULL) | |
1871 #endif | |
1872 { | |
1873 int i, modecount; | |
1874 int screen; | |
1875 | |
1876 screen = DefaultScreen(dpy); | |
5019 | 1877 |
12582 | 1878 free(vidmodes); |
1879 vidmodes = NULL; | |
1880 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1881 &vidmodes); | |
1882 for (i = 0; i < modecount; i++) | |
1883 if ((vidmodes[i]->hdisplay == vo_screenwidth) | |
1884 && (vidmodes[i]->vdisplay == vo_screenheight)) | |
1885 { | |
1886 mp_msg(MSGT_VO, MSGL_INFO, | |
1887 "Returning to original mode %dx%d\n", | |
1888 vo_screenwidth, vo_screenheight); | |
1889 break; | |
1890 } | |
5019 | 1891 |
12582 | 1892 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); |
1893 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); | |
1894 free(vidmodes); | |
1895 vidmodes = NULL; | |
1896 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1897 } |
3990 | 1898 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1899 |
12582 | 1900 #endif /* X11_FULLSCREEN */ |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1901 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1902 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1903 /* |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1904 * Scan the available visuals on this Display/Screen. Try to find |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1905 * the 'best' available TrueColor visual that has a decent color |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1906 * depth (at least 15bit). If there are multiple visuals with depth |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1907 * >= 15bit, we prefer visuals with a smaller color depth. |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1908 */ |
12582 | 1909 int vo_find_depth_from_visuals(Display * dpy, int screen, |
1910 Visual ** visual_return) | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1911 { |
12582 | 1912 XVisualInfo visual_tmpl; |
1913 XVisualInfo *visuals; | |
1914 int nvisuals, i; | |
1915 int bestvisual = -1; | |
1916 int bestvisual_depth = -1; | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1917 |
12582 | 1918 visual_tmpl.screen = screen; |
1919 visual_tmpl.class = TrueColor; | |
1920 visuals = XGetVisualInfo(dpy, | |
1921 VisualScreenMask | VisualClassMask, | |
1922 &visual_tmpl, &nvisuals); | |
1923 if (visuals != NULL) | |
1924 { | |
1925 for (i = 0; i < nvisuals; i++) | |
1926 { | |
1927 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1928 "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n", |
12582 | 1929 visuals[i].visualid, visuals[i].depth, |
1930 visuals[i].red_mask, visuals[i].green_mask, | |
1931 visuals[i].blue_mask); | |
1932 /* | |
1933 * save the visual index and it's depth, if this is the first | |
1934 * truecolor visul, or a visual that is 'preferred' over the | |
1935 * previous 'best' visual | |
1936 */ | |
1937 if (bestvisual_depth == -1 | |
1938 || (visuals[i].depth >= 15 | |
1939 && (visuals[i].depth < bestvisual_depth | |
1940 || bestvisual_depth < 15))) | |
1941 { | |
1942 bestvisual = i; | |
1943 bestvisual_depth = visuals[i].depth; | |
1944 } | |
1945 } | |
1946 | |
1947 if (bestvisual != -1 && visual_return != NULL) | |
1948 *visual_return = visuals[bestvisual].visual; | |
1949 | |
1950 XFree(visuals); | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1951 } |
12582 | 1952 return bestvisual_depth; |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1953 } |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1954 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1955 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1956 static Colormap cmap = None; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1957 static XColor cols[256]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1958 static int cm_size, red_mask, green_mask, blue_mask; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1959 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1960 |
12582 | 1961 Colormap vo_x11_create_colormap(XVisualInfo * vinfo) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1962 { |
12582 | 1963 unsigned k, r, g, b, ru, gu, bu, m, rv, gv, bv, rvu, gvu, bvu; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1964 |
12582 | 1965 if (vinfo->class != DirectColor) |
1966 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, | |
1967 AllocNone); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1968 |
12582 | 1969 /* can this function get called twice or more? */ |
1970 if (cmap) | |
1971 return cmap; | |
1972 cm_size = vinfo->colormap_size; | |
1973 red_mask = vinfo->red_mask; | |
1974 green_mask = vinfo->green_mask; | |
1975 blue_mask = vinfo->blue_mask; | |
1976 ru = (red_mask & (red_mask - 1)) ^ red_mask; | |
1977 gu = (green_mask & (green_mask - 1)) ^ green_mask; | |
1978 bu = (blue_mask & (blue_mask - 1)) ^ blue_mask; | |
1979 rvu = 65536ull * ru / (red_mask + ru); | |
1980 gvu = 65536ull * gu / (green_mask + gu); | |
1981 bvu = 65536ull * bu / (blue_mask + bu); | |
1982 r = g = b = 0; | |
1983 rv = gv = bv = 0; | |
1984 m = DoRed | DoGreen | DoBlue; | |
1985 for (k = 0; k < cm_size; k++) | |
1986 { | |
1987 int t; | |
1988 | |
1989 cols[k].pixel = r | g | b; | |
1990 cols[k].red = rv; | |
1991 cols[k].green = gv; | |
1992 cols[k].blue = bv; | |
1993 cols[k].flags = m; | |
1994 t = (r + ru) & red_mask; | |
1995 if (t < r) | |
1996 m &= ~DoRed; | |
1997 r = t; | |
1998 t = (g + gu) & green_mask; | |
1999 if (t < g) | |
2000 m &= ~DoGreen; | |
2001 g = t; | |
2002 t = (b + bu) & blue_mask; | |
2003 if (t < b) | |
2004 m &= ~DoBlue; | |
2005 b = t; | |
2006 rv += rvu; | |
2007 gv += gvu; | |
2008 bv += bvu; | |
2009 } | |
2010 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll); | |
2011 XStoreColors(mDisplay, cmap, cols, cm_size); | |
2012 return cmap; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2013 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2014 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2015 /* |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2016 * Via colormaps/gamma ramps we can do gamma, brightness, contrast, |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2017 * hue and red/green/blue intensity, but we cannot do saturation. |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2018 * Currently only gamma, brightness and contrast are implemented. |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2019 * Is there sufficient interest for hue and/or red/green/blue intensity? |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2020 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2021 /* these values have range [-100,100] and are initially 0 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2022 static int vo_gamma = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2023 static int vo_brightness = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2024 static int vo_contrast = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2025 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2026 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2027 uint32_t vo_x11_set_equalizer(char *name, int value) |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2028 { |
12582 | 2029 float gamma, brightness, contrast; |
2030 float rf, gf, bf; | |
2031 int k; | |
2032 | |
2033 /* | |
2034 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case | |
2035 * of TrueColor-ed window but be careful: | |
2036 * unlike the colormaps, which are private for the X client | |
2037 * who created them and thus automatically destroyed on client | |
2038 * disconnect, this gamma ramp is a system-wide (X-server-wide) | |
2039 * setting and _must_ be restored before the process exit. | |
2040 * Unforunately when the process crashes (or get killed | |
2041 * for some reason) it is impossible to restore the setting, | |
2042 * and such behaviour could be rather annoying for the users. | |
2043 */ | |
2044 if (cmap == None) | |
2045 return VO_NOTAVAIL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2046 |
12582 | 2047 if (!strcasecmp(name, "brightness")) |
2048 vo_brightness = value; | |
2049 else if (!strcasecmp(name, "contrast")) | |
2050 vo_contrast = value; | |
2051 else if (!strcasecmp(name, "gamma")) | |
2052 vo_gamma = value; | |
2053 else | |
2054 return VO_NOTIMPL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2055 |
12582 | 2056 brightness = 0.01 * vo_brightness; |
2057 contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4); | |
2058 gamma = pow(2, -0.02 * vo_gamma); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2059 |
12582 | 2060 rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask; |
2061 gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) / | |
2062 green_mask; | |
2063 bf = (float) ((blue_mask & (blue_mask - 1)) ^ blue_mask) / blue_mask; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2064 |
12582 | 2065 /* now recalculate the colormap using the newly set value */ |
2066 for (k = 0; k < cm_size; k++) | |
2067 { | |
2068 float s; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2069 |
12582 | 2070 s = pow(rf * k, gamma); |
2071 s = (s - 0.5) * contrast + 0.5; | |
2072 s += brightness; | |
2073 if (s < 0) | |
2074 s = 0; | |
2075 if (s > 1) | |
2076 s = 1; | |
2077 cols[k].red = (unsigned short) (s * 65535); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2078 |
12582 | 2079 s = pow(gf * k, gamma); |
2080 s = (s - 0.5) * contrast + 0.5; | |
2081 s += brightness; | |
2082 if (s < 0) | |
2083 s = 0; | |
2084 if (s > 1) | |
2085 s = 1; | |
2086 cols[k].green = (unsigned short) (s * 65535); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2087 |
12582 | 2088 s = pow(bf * k, gamma); |
2089 s = (s - 0.5) * contrast + 0.5; | |
2090 s += brightness; | |
2091 if (s < 0) | |
2092 s = 0; | |
2093 if (s > 1) | |
2094 s = 1; | |
2095 cols[k].blue = (unsigned short) (s * 65535); | |
2096 } | |
2097 | |
2098 XStoreColors(mDisplay, cmap, cols, cm_size); | |
2099 XFlush(mDisplay); | |
2100 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2101 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2102 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2103 uint32_t vo_x11_get_equalizer(char *name, int *value) |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2104 { |
12582 | 2105 if (cmap == None) |
2106 return VO_NOTAVAIL; | |
2107 if (!strcasecmp(name, "brightness")) | |
2108 *value = vo_brightness; | |
2109 else if (!strcasecmp(name, "contrast")) | |
2110 *value = vo_contrast; | |
2111 else if (!strcasecmp(name, "gamma")) | |
2112 *value = vo_gamma; | |
2113 else | |
2114 return VO_NOTIMPL; | |
2115 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2116 } |
12582 | 2117 |
10359 | 2118 #ifdef HAVE_XV |
2119 int vo_xv_set_eq(uint32_t xv_port, char *name, int value) | |
2120 { | |
2121 XvAttribute *attributes; | |
12582 | 2122 int i, howmany, xv_atom; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2123 |
10359 | 2124 mp_dbg(MSGT_VO, MSGL_V, "xv_set_eq called! (%s, %d)\n", name, value); |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2125 |
10359 | 2126 /* get available attributes */ |
2127 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2128 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2129 if (attributes[i].flags & XvSettable) |
2130 { | |
2131 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2132 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2133 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2134 if (xv_atom != None) |
2135 { | |
2136 int hue = 0, port_value, port_min, port_max; | |
10359 | 2137 |
12582 | 2138 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2139 (!strcasecmp(name, "brightness"))) | |
2140 port_value = value; | |
2141 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2142 (!strcasecmp(name, "contrast"))) | |
2143 port_value = value; | |
2144 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2145 (!strcasecmp(name, "saturation"))) | |
2146 port_value = value; | |
2147 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2148 (!strcasecmp(name, "hue"))) | |
2149 { | |
2150 port_value = value; | |
2151 hue = 1; | |
2152 } else | |
10359 | 2153 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2154 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2155 (!strcasecmp(name, "red_intensity"))) | |
2156 port_value = value; | |
2157 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2158 && (!strcasecmp(name, "green_intensity"))) | |
2159 port_value = value; | |
2160 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2161 && (!strcasecmp(name, "blue_intensity"))) | |
2162 port_value = value; | |
2163 else | |
2164 continue; | |
2165 | |
2166 port_min = attributes[i].min_value; | |
2167 port_max = attributes[i].max_value; | |
10359 | 2168 |
12582 | 2169 /* nvidia hue workaround */ |
2170 if (hue && port_min == 0 && port_max == 360) | |
2171 { | |
2172 port_value = | |
2173 (port_value >= | |
2174 0) ? (port_value - 100) : (port_value + 100); | |
10359 | 2175 } |
12582 | 2176 // -100 -> min |
2177 // 0 -> (max+min)/2 | |
2178 // +100 -> max | |
2179 port_value = | |
2180 (port_value + 100) * (port_max - port_min) / 200 + | |
2181 port_min; | |
2182 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value); | |
2183 return (VO_TRUE); | |
2184 } | |
2185 } | |
2186 return (VO_FALSE); | |
10359 | 2187 } |
2188 | |
2189 int vo_xv_get_eq(uint32_t xv_port, char *name, int *value) | |
2190 { | |
12582 | 2191 |
10359 | 2192 XvAttribute *attributes; |
12582 | 2193 int i, howmany, xv_atom; |
10359 | 2194 |
2195 /* get available attributes */ | |
2196 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2197 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2198 if (attributes[i].flags & XvGettable) |
2199 { | |
2200 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2201 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2202 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2203 if (xv_atom != None) |
2204 { | |
2205 int val, port_value = 0, port_min, port_max; | |
10359 | 2206 |
12582 | 2207 XvGetPortAttribute(mDisplay, xv_port, xv_atom, |
2208 &port_value); | |
2209 | |
2210 port_min = attributes[i].min_value; | |
2211 port_max = attributes[i].max_value; | |
2212 val = | |
2213 (port_value - port_min) * 200 / (port_max - port_min) - | |
2214 100; | |
10359 | 2215 |
12582 | 2216 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2217 (!strcasecmp(name, "brightness"))) | |
2218 *value = val; | |
2219 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2220 (!strcasecmp(name, "contrast"))) | |
2221 *value = val; | |
2222 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2223 (!strcasecmp(name, "saturation"))) | |
2224 *value = val; | |
2225 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2226 (!strcasecmp(name, "hue"))) | |
2227 { | |
2228 /* nasty nvidia detect */ | |
2229 if (port_min == 0 && port_max == 360) | |
2230 *value = (val >= 0) ? (val - 100) : (val + 100); | |
2231 else | |
2232 *value = val; | |
2233 } else | |
10359 | 2234 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2235 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2236 (!strcasecmp(name, "red_intensity"))) | |
2237 *value = val; | |
2238 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2239 && (!strcasecmp(name, "green_intensity"))) | |
2240 *value = val; | |
2241 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2242 && (!strcasecmp(name, "blue_intensity"))) | |
2243 *value = val; | |
2244 else | |
2245 continue; | |
10359 | 2246 |
12582 | 2247 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", |
2248 name, *value); | |
2249 return (VO_TRUE); | |
2250 } | |
2251 } | |
2252 return (VO_FALSE); | |
10359 | 2253 } |
2254 | |
14742 | 2255 /** \brief contains flags changing the execution of the colorkeying code */ |
2256 xv_ck_info_t xv_ck_info = { CK_METHOD_MANUALFILL, CK_SRC_CUR }; | |
2257 unsigned long xv_colorkey; ///< The color used for manual colorkeying. | |
2258 unsigned int xv_port; ///< The selected Xv port. | |
2259 | |
2260 /** | |
2261 * \brief Interns the requested atom if it is available. | |
2262 * | |
2263 * \param atom_name String containing the name of the requested atom. | |
2264 * | |
2265 * \return Returns the atom if available, else None is returned. | |
2266 * | |
2267 */ | |
2268 static Atom xv_intern_atom_if_exists( char const * atom_name ) | |
2269 { | |
2270 XvAttribute * attributes; | |
2271 int attrib_count,i; | |
2272 Atom xv_atom = None; | |
2273 | |
2274 attributes = XvQueryPortAttributes( mDisplay, xv_port, &attrib_count ); | |
2275 if( attributes!=NULL ) | |
2276 { | |
2277 for ( i = 0; i < attrib_count; ++i ) | |
2278 { | |
2279 if ( strcmp(attributes[i].name, atom_name ) == 0 ) | |
2280 { | |
2281 xv_atom = XInternAtom( mDisplay, atom_name, False ); | |
2282 break; // found what we want, break out | |
2283 } | |
2284 } | |
2285 XFree( attributes ); | |
2286 } | |
2287 | |
2288 return xv_atom; | |
2289 } | |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2290 |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2291 /** |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2292 * \brief Try to enable vsync for xv. |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2293 * \return Returns -1 if not available, 0 on failure and 1 on success. |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2294 */ |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2295 int vo_xv_enable_vsync() |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2296 { |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2297 Atom xv_atom = xv_intern_atom_if_exists("XV_SYNC_TO_VBLANK"); |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2298 if (xv_atom == None) |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2299 return -1; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2300 return XvSetPortAttribute(mDisplay, xv_port, xv_atom, 1) == Success; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2301 } |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2302 |
14742 | 2303 /** |
16958 | 2304 * \brief Get maximum supported source image dimensions. |
2305 * | |
2306 * This function does not set the variables pointed to by | |
2307 * width and height if the information could not be retreived. | |
2308 * So the caller is reponsible for initing them properly. | |
2309 * | |
2310 * \param width [out] The maximum width gets stored here. | |
2311 * \param height [out] The maximum height gets stored here. | |
2312 * | |
2313 */ | |
2314 void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ) | |
2315 { | |
2316 XvEncodingInfo * encodings; | |
2317 //unsigned long num_encodings, idx; to int or too long?! | |
2318 unsigned int num_encodings, idx; | |
2319 | |
2320 XvQueryEncodings( mDisplay, xv_port, &num_encodings, &encodings); | |
2321 | |
2322 if ( encodings ) | |
2323 { | |
2324 for ( idx = 0; idx < num_encodings; ++idx ) | |
2325 { | |
2326 if ( strcmp( encodings[idx].name, "XV_IMAGE" ) == 0 ) | |
2327 { | |
2328 *width = encodings[idx].width; | |
2329 *height = encodings[idx].height; | |
2330 break; | |
2331 } | |
2332 } | |
2333 } | |
2334 | |
2335 mp_msg( MSGT_VO, MSGL_V, | |
2336 "[xv common] Maximum source image dimensions: %ux%u\n", | |
2337 *width, *height ); | |
2338 | |
2339 XvFreeEncodingInfo( encodings ); | |
2340 } | |
2341 | |
2342 /** | |
14742 | 2343 * \brief Print information about the colorkey method and source. |
2344 * | |
2345 * \param ck_handling Integer value containing the information about | |
2346 * colorkey handling (see x11_common.h). | |
2347 * | |
2348 * Outputs the content of |ck_handling| as a readable message. | |
2349 * | |
2350 */ | |
2351 void vo_xv_print_ck_info() | |
2352 { | |
2353 mp_msg( MSGT_VO, MSGL_V, "[xv common] " ); | |
2354 | |
2355 switch ( xv_ck_info.method ) | |
2356 { | |
2357 case CK_METHOD_NONE: | |
2358 mp_msg( MSGT_VO, MSGL_V, "Drawing no colorkey.\n" ); return; | |
2359 case CK_METHOD_AUTOPAINT: | |
2360 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn by Xv." ); break; | |
2361 case CK_METHOD_MANUALFILL: | |
2362 mp_msg( MSGT_VO, MSGL_V, "Drawing colorkey manually." ); break; | |
2363 case CK_METHOD_BACKGROUND: | |
2364 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn as window background." ); break; | |
2365 } | |
2366 | |
2367 mp_msg( MSGT_VO, MSGL_V, "\n[xv common] " ); | |
2368 | |
2369 switch ( xv_ck_info.source ) | |
2370 { | |
2371 case CK_SRC_CUR: | |
17366 | 2372 mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n", |
14742 | 2373 xv_colorkey ); |
2374 break; | |
2375 case CK_SRC_USE: | |
2376 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2377 { | |
2378 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2379 "Ignoring colorkey from MPlayer (0x%06lx).\n", |
14742 | 2380 xv_colorkey ); |
2381 } | |
2382 else | |
2383 { | |
2384 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2385 "Using colorkey from MPlayer (0x%06lx)." |
14742 | 2386 " Use -colorkey to change.\n", |
2387 xv_colorkey ); | |
2388 } | |
2389 break; | |
2390 case CK_SRC_SET: | |
2391 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2392 "Setting and using colorkey from MPlayer (0x%06lx)." |
14742 | 2393 " Use -colorkey to change.\n", |
2394 xv_colorkey ); | |
2395 break; | |
2396 } | |
2397 } | |
2398 /** | |
2399 * \brief Init colorkey depending on the settings in xv_ck_info. | |
2400 * | |
2401 * \return Returns 0 on failure and 1 on success. | |
2402 * | |
2403 * Sets the colorkey variable according to the CK_SRC_* and CK_METHOD_* | |
2404 * flags in xv_ck_info. | |
2405 * | |
2406 * Possiblilities: | |
2407 * * Methods | |
2408 * - manual colorkey drawing ( CK_METHOD_MANUALFILL ) | |
2409 * - set colorkey as window background ( CK_METHOD_BACKGROUND ) | |
2410 * - let Xv paint the colorkey ( CK_METHOD_AUTOPAINT ) | |
2411 * * Sources | |
2412 * - use currently set colorkey ( CK_SRC_CUR ) | |
2413 * - use colorkey in vo_colorkey ( CK_SRC_USE ) | |
2414 * - use and set colorkey in vo_colorkey ( CK_SRC_SET ) | |
2415 * | |
2416 * NOTE: If vo_colorkey has bits set after the first 3 low order bytes | |
2417 * we don't draw anything as this means it was forced to off. | |
2418 */ | |
2419 int vo_xv_init_colorkey() | |
2420 { | |
2421 Atom xv_atom; | |
2422 int rez; | |
2423 | |
2424 /* check if colorkeying is needed */ | |
2425 xv_atom = xv_intern_atom_if_exists( "XV_COLORKEY" ); | |
2426 | |
2427 /* if we have to deal with colorkeying ... */ | |
2428 if( xv_atom != None && !(vo_colorkey & 0xFF000000) ) | |
2429 { | |
2430 /* check if we should use the colorkey specified in vo_colorkey */ | |
2431 if ( xv_ck_info.source != CK_SRC_CUR ) | |
2432 { | |
2433 xv_colorkey = vo_colorkey; | |
2434 | |
2435 /* check if we have to set the colorkey too */ | |
2436 if ( xv_ck_info.source == CK_SRC_SET ) | |
2437 { | |
2438 xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False); | |
2439 | |
2440 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, vo_colorkey ); | |
2441 if ( rez != Success ) | |
2442 { | |
2443 mp_msg( MSGT_VO, MSGL_FATAL, | |
2444 "[xv common] Couldn't set colorkey!\n" ); | |
2445 return 0; // error setting colorkey | |
2446 } | |
2447 } | |
2448 } | |
2449 else | |
2450 { | |
2451 int colorkey_ret; | |
2452 | |
2453 rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey_ret); | |
2454 if ( rez == Success ) | |
2455 { | |
2456 xv_colorkey = colorkey_ret; | |
2457 } | |
2458 else | |
2459 { | |
2460 mp_msg( MSGT_VO, MSGL_FATAL, | |
2461 "[xv common] Couldn't get colorkey!" | |
2462 "Maybe the selected Xv port has no overlay.\n" ); | |
2463 return 0; // error getting colorkey | |
2464 } | |
2465 } | |
2466 | |
15186 | 2467 xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" ); |
2468 | |
14742 | 2469 /* should we draw the colorkey ourselves or activate autopainting? */ |
2470 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2471 { | |
2472 rez = !Success; // reset rez to something different than Success | |
2473 | |
2474 if ( xv_atom != None ) // autopaint is supported | |
2475 { | |
2476 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, 1 ); | |
2477 } | |
2478 | |
2479 if ( rez != Success ) | |
2480 { | |
2481 // fallback to manual colorkey drawing | |
2482 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2483 } | |
2484 } | |
15186 | 2485 else // disable colorkey autopainting if supported |
2486 { | |
2487 if ( xv_atom != None ) // we have autopaint attribute | |
2488 { | |
2489 XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 ); | |
2490 } | |
2491 } | |
14742 | 2492 } |
2493 else // do no colorkey drawing at all | |
2494 { | |
2495 xv_ck_info.method = CK_METHOD_NONE; | |
2496 } /* end: should we draw colorkey */ | |
2497 | |
2498 /* output information about the curren colorkey settings */ | |
2499 vo_xv_print_ck_info(); | |
2500 | |
2501 return 1; // success | |
2502 } | |
2503 | |
2504 /** | |
2505 * \brief Draw the colorkey on the video window. | |
2506 * | |
2507 * Draws the colorkey depending on the set method ( colorkey_handling ). | |
2508 * | |
2509 * It also draws the black bars ( when the video doesn't fit to the | |
2510 * display in full screen ) seperately, so they don't overlap with the | |
2511 * video area. | |
15100 | 2512 * It doesn't call XFlush |
14742 | 2513 * |
2514 */ | |
15100 | 2515 inline void vo_xv_draw_colorkey( int32_t x, int32_t y, |
2516 int32_t w, int32_t h ) | |
14742 | 2517 { |
15100 | 2518 if( xv_ck_info.method == CK_METHOD_MANUALFILL || |
2519 xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow() | |
14742 | 2520 { |
2521 XSetForeground( mDisplay, vo_gc, xv_colorkey ); | |
2522 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2523 x, y, | |
2524 w, h ); | |
2525 } | |
2526 | |
2527 /* draw black bars if needed */ | |
15100 | 2528 /* TODO! move this to vo_x11_clearwindow_part() */ |
14742 | 2529 if ( vo_fs ) |
2530 { | |
2531 XSetForeground( mDisplay, vo_gc, 0 ); | |
15100 | 2532 /* making non overlap fills, requiare 8 checks instead of 4*/ |
14742 | 2533 if ( y > 0 ) |
2534 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2535 0, 0, | |
2536 vo_screenwidth, y); | |
2537 if (x > 0) | |
2538 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2539 0, 0, |
2540 x, vo_screenheight); | |
14742 | 2541 if (x + w < vo_screenwidth) |
2542 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2543 x + w, 0, |
2544 vo_screenwidth, vo_screenheight); | |
14742 | 2545 if (y + h < vo_screenheight) |
2546 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2547 0, y + h, | |
15100 | 2548 vo_screenwidth, vo_screenheight); |
14742 | 2549 } |
2550 } | |
2551 | |
2552 /** \brief tests if a valid arg for the ck suboption was given */ | |
2553 int xv_test_ck( void * arg ) | |
2554 { | |
2555 strarg_t * strarg = (strarg_t *)arg; | |
2556 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2557 if ( strargcmp( strarg, "use" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2558 strargcmp( strarg, "set" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2559 strargcmp( strarg, "cur" ) == 0 ) |
14742 | 2560 { |
2561 return 1; | |
2562 } | |
2563 | |
2564 return 0; | |
2565 } | |
2566 /** \brief tests if a valid arg for the ck-method suboption was given */ | |
2567 int xv_test_ckm( void * arg ) | |
2568 { | |
2569 strarg_t * strarg = (strarg_t *)arg; | |
2570 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2571 if ( strargcmp( strarg, "bg" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2572 strargcmp( strarg, "man" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2573 strargcmp( strarg, "auto" ) == 0 ) |
14742 | 2574 { |
2575 return 1; | |
2576 } | |
2577 | |
2578 return 0; | |
2579 } | |
2580 | |
2581 /** | |
2582 * \brief Modify the colorkey_handling var according to str | |
2583 * | |
2584 * Checks if a valid pointer ( not NULL ) to the string | |
2585 * was given. And in that case modifies the colorkey_handling | |
2586 * var to reflect the requested behaviour. | |
2587 * If nothing happens the content of colorkey_handling stays | |
2588 * the same. | |
2589 * | |
2590 * \param str Pointer to the string or NULL | |
2591 * | |
2592 */ | |
2593 void xv_setup_colorkeyhandling( char const * ck_method_str, | |
2594 char const * ck_str ) | |
2595 { | |
2596 /* check if a valid pointer to the string was passed */ | |
2597 if ( ck_str ) | |
2598 { | |
2599 if ( strncmp( ck_str, "use", 3 ) == 0 ) | |
2600 { | |
2601 xv_ck_info.source = CK_SRC_USE; | |
2602 } | |
2603 else if ( strncmp( ck_str, "set", 3 ) == 0 ) | |
2604 { | |
2605 xv_ck_info.source = CK_SRC_SET; | |
2606 } | |
2607 } | |
2608 /* check if a valid pointer to the string was passed */ | |
2609 if ( ck_method_str ) | |
2610 { | |
2611 if ( strncmp( ck_method_str, "bg", 2 ) == 0 ) | |
2612 { | |
2613 xv_ck_info.method = CK_METHOD_BACKGROUND; | |
2614 } | |
2615 else if ( strncmp( ck_method_str, "man", 3 ) == 0 ) | |
2616 { | |
2617 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2618 } | |
2619 else if ( strncmp( ck_method_str, "auto", 4 ) == 0 ) | |
2620 { | |
2621 xv_ck_info.method = CK_METHOD_AUTOPAINT; | |
2622 } | |
2623 } | |
2624 } | |
2625 | |
10359 | 2626 #endif |