Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 13498:5e21336ee2a0
THE "vf=eq2=1.0:-0.8" fix
Sync with 1.754: better default parameter,added counterpart option, better names for few options, 3-pass support and improved documentation.
( Eng patch by Loren Merritt )
author | gpoirier |
---|---|
date | Tue, 28 Sep 2004 08:17:45 +0000 |
parents | c8900eba2cc7 |
children | e047e70a9767 |
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> |
15 #include <sys/mman.h> | |
9695 | 16 #include <signal.h> |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
17 #include <assert.h> |
32 | 18 |
19 #include "video_out.h" | |
10889 | 20 #include "aspect.h" |
12032
8cc4d4344c0f
Don't mess with the window position in xinerama when -geometry changes it.
diego
parents:
12031
diff
changeset
|
21 #include "geometry.h" |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
22 #include "help_mp.h" |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
23 #include "../osdep/timer.h" |
32 | 24 |
324 | 25 #include <X11/Xmd.h> |
32 | 26 #include <X11/Xlib.h> |
27 #include <X11/Xutil.h> | |
28 #include <X11/Xatom.h> | |
29 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
30 #ifdef HAVE_XDPMS |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
31 #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
|
32 #endif |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
33 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
34 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
35 #include <X11/extensions/Xinerama.h> |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
36 #endif |
1732 | 37 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
38 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
39 #include <X11/extensions/xf86vmode.h> |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
40 #include <X11/XF86keysym.h> |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
41 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
42 |
10359 | 43 #ifdef HAVE_XV |
44 #include <X11/extensions/Xv.h> | |
45 #include <X11/extensions/Xvlib.h> | |
46 #endif | |
47 | |
4658 | 48 #include "../input/input.h" |
49 #include "../input/mouse.h" | |
50 | |
4798 | 51 #ifdef HAVE_NEW_GUI |
52 #include "../Gui/interface.h" | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
53 #include "../mplayer.h" |
4798 | 54 #endif |
55 | |
8660
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
56 #define WIN_LAYER_ONBOTTOM 2 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
57 #define WIN_LAYER_NORMAL 4 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
58 #define WIN_LAYER_ONTOP 6 |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
59 #define WIN_LAYER_ABOVE_DOCK 10 |
12582 | 60 |
61 int fs_layer = WIN_LAYER_ABOVE_DOCK; | |
62 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
|
63 static int old_gravity = NorthWestGravity; |
8866 | 64 |
12582 | 65 int stop_xscreensaver = 0; |
6202 | 66 |
12582 | 67 static int dpms_disabled = 0; |
68 static int timeout_save = 0; | |
69 static int kdescreensaver_was_running = 0; | |
324 | 70 |
12582 | 71 char *mDisplayName = NULL; |
72 Display *mDisplay = NULL; | |
73 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
|
74 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
|
75 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
|
76 |
3830 | 77 /* output window id */ |
12582 | 78 int WinID = -1; |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
79 int vo_mouse_autohide = 0; |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
80 int vo_wm_type = 0; |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
81 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
|
82 static int vo_fs_flip = 0; |
12582 | 83 char **vo_fstype_list; |
384 | 84 |
8835
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
85 /* 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
|
86 int metacity_hack = 0; |
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
87 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
88 static Atom XA_NET_SUPPORTED; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
89 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
|
90 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
|
91 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
|
92 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
|
93 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
|
94 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
|
95 static Atom XA_WIN_PROTOCOLS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
96 static Atom XA_WIN_LAYER; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
97 static Atom XA_WIN_HINTS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
98 static Atom XA_BLACKBOX_PID; |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
99 |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
100 #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
|
101 |
7435 | 102 static int vo_old_x = 0; |
103 static int vo_old_y = 0; | |
104 static int vo_old_width = 0; | |
105 static int vo_old_height = 0; | |
106 | |
4017 | 107 #ifdef HAVE_XINERAMA |
108 int xinerama_screen = 0; | |
109 int xinerama_x = 0; | |
110 int xinerama_y = 0; | |
111 #endif | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
112 #ifdef HAVE_XF86VM |
12582 | 113 XF86VidModeModeInfo **vidmodes = NULL; |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
114 XF86VidModeModeLine modeline; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
115 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
116 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
117 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
|
118 |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
119 |
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 * Sends the EWMH fullscreen state event. |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
122 * |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
123 * 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
|
124 * _NET_WM_STATE_ADD -- add state |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
125 * _NET_WM_STATE_TOGGLE -- toggle |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
126 */ |
12582 | 127 void vo_x11_ewmh_fullscreen(int action) |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
128 { |
12582 | 129 assert(action == _NET_WM_STATE_REMOVE || |
130 action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE); | |
131 | |
132 if (vo_fs_type & vo_wm_FULLSCREEN) | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
133 { |
12582 | 134 XEvent xev; |
135 | |
136 /* init X event structure for _NET_WM_FULLSCREEN client msg */ | |
137 xev.xclient.type = ClientMessage; | |
138 xev.xclient.serial = 0; | |
139 xev.xclient.send_event = True; | |
140 xev.xclient.message_type = XInternAtom(mDisplay, | |
141 "_NET_WM_STATE", False); | |
142 xev.xclient.window = vo_window; | |
143 xev.xclient.format = 32; | |
144 xev.xclient.data.l[0] = action; | |
145 xev.xclient.data.l[1] = XInternAtom(mDisplay, | |
146 "_NET_WM_STATE_FULLSCREEN", | |
147 False); | |
148 xev.xclient.data.l[2] = 0; | |
149 xev.xclient.data.l[3] = 0; | |
150 xev.xclient.data.l[4] = 0; | |
151 | |
152 /* finally send that damn thing */ | |
153 if (!XSendEvent(mDisplay, DefaultRootWindow(mDisplay), False, | |
154 SubstructureRedirectMask | SubstructureNotifyMask, | |
155 &xev)) | |
156 { | |
157 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_EwmhFullscreenStateFailed); | |
158 } | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
159 } |
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 |
12582 | 162 void vo_hidecursor(Display * disp, Window win) |
384 | 163 { |
12582 | 164 Cursor no_ptr; |
165 Pixmap bm_no; | |
166 XColor black, dummy; | |
167 Colormap colormap; | |
168 static unsigned char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; | |
3954 | 169 |
12582 | 170 if (WinID == 0) |
171 return; // do not hide, if we're playing at rootwin | |
172 | |
173 colormap = DefaultColormap(disp, DefaultScreen(disp)); | |
174 XAllocNamedColor(disp, colormap, "black", &black, &dummy); | |
175 bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8); | |
176 no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0); | |
177 XDefineCursor(disp, win, no_ptr); | |
178 XFreeCursor(disp, no_ptr); | |
179 if (bm_no != None) | |
180 XFreePixmap(disp, bm_no); | |
384 | 181 } |
182 | |
12582 | 183 void vo_showcursor(Display * disp, Window win) |
184 { | |
185 if (WinID == 0) | |
186 return; | |
187 XDefineCursor(disp, win, 0); | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
188 } |
384 | 189 |
12582 | 190 static int x11_errorhandler(Display * display, XErrorEvent * event) |
4742 | 191 { |
192 #define MSGLEN 60 | |
193 char msg[MSGLEN]; | |
12582 | 194 |
195 XGetErrorText(display, event->error_code, (char *) &msg, MSGLEN); | |
196 | |
197 mp_msg(MSGT_VO, MSGL_ERR, "X11 error: %s\n", msg); | |
198 | |
199 mp_msg(MSGT_VO, MSGL_V, | |
200 "Type: %x, display: %x, resourceid: %x, serial: %x\n", | |
201 event->type, event->display, event->resourceid, event->serial); | |
202 mp_msg(MSGT_VO, MSGL_V, | |
203 "Error code: %x, request code: %x, minor code: %x\n", | |
204 event->error_code, event->request_code, event->minor_code); | |
205 | |
6095 | 206 abort(); |
207 //exit_player("X11 error"); | |
4742 | 208 #undef MSGLEN |
209 } | |
1732 | 210 |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
211 void fstype_help(void) |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
212 { |
12582 | 213 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType); |
214 | |
215 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none", | |
216 "don't set fullscreen window layer"); | |
217 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer", | |
218 "use _WIN_LAYER hint with default layer"); | |
219 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer=<0..15>", | |
220 "use _WIN_LAYER hint with a given layer number"); | |
221 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "netwm", | |
222 "force NETWM style"); | |
223 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "above", | |
224 "use _NETWM_STATE_ABOVE hint if available"); | |
225 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below", | |
226 "use _NETWM_STATE_BELOW hint if available"); | |
227 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen", | |
228 "use _NETWM_STATE_FULLSCREEN hint if availale"); | |
229 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top", | |
230 "use _NETWM_STATE_STAYS_ON_TOP hint if available"); | |
231 mp_msg(MSGT_VO, MSGL_INFO, | |
232 "You can also negate the settings with simply putting '-' in the beginning"); | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
233 } |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
234 |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
235 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
|
236 { |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
237 if (fstype) |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
238 { |
12582 | 239 mp_msg(MSGT_VO, MSGL_V, "[x11] Current fstype setting honours"); |
240 if (fstype & vo_wm_LAYER) | |
241 mp_msg(MSGT_VO, MSGL_V, " LAYER"); | |
242 if (fstype & vo_wm_FULLSCREEN) | |
243 mp_msg(MSGT_VO, MSGL_V, " FULLSCREEN"); | |
244 if (fstype & vo_wm_STAYS_ON_TOP) | |
245 mp_msg(MSGT_VO, MSGL_V, " STAYS_ON_TOP"); | |
246 if (fstype & vo_wm_ABOVE) | |
247 mp_msg(MSGT_VO, MSGL_V, " ABOVE"); | |
248 if (fstype & vo_wm_BELOW) | |
249 mp_msg(MSGT_VO, MSGL_V, " BELOW"); | |
250 mp_msg(MSGT_VO, MSGL_V, " X atoms\n"); | |
251 } else | |
252 mp_msg(MSGT_VO, MSGL_V, | |
253 "[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
|
254 } |
12582 | 255 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
256 static int net_wm_support_state_test(Atom atom) |
8653 | 257 { |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
258 #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 | 259 |
260 NET_WM_STATE_TEST(FULLSCREEN); | |
261 NET_WM_STATE_TEST(ABOVE); | |
262 NET_WM_STATE_TEST(STAYS_ON_TOP); | |
263 NET_WM_STATE_TEST(BELOW); | |
264 return 0; | |
8653 | 265 } |
266 | |
12582 | 267 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
|
268 { |
12582 | 269 int format; |
270 unsigned long bytesafter; | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
271 |
12582 | 272 return (Success == |
273 XGetWindowProperty(mDisplay, mRootWin, type, 0, 16384, False, | |
274 AnyPropertyType, &type, &format, nitems, | |
275 &bytesafter, (unsigned char **) args) | |
276 && *nitems > 0); | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
277 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
278 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
279 static int vo_wm_detect(void) |
6009 | 280 { |
12582 | 281 int i; |
282 int wm = 0; | |
283 unsigned long nitems; | |
284 Atom *args = NULL; | |
285 | |
286 if (WinID >= 0) | |
287 return 0; | |
288 | |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
289 // -- supports layers |
12582 | 290 if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems)) |
291 { | |
292 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports layers.\n"); | |
293 for (i = 0; i < nitems; i++) | |
294 { | |
295 if (args[i] == XA_WIN_LAYER) | |
296 { | |
297 wm |= vo_wm_LAYER; | |
298 metacity_hack |= 1; | |
299 } else | |
300 // metacity is the only manager I know which reports support only for _WIN_LAYER | |
301 // hint in _WIN_PROTOCOLS (what's more support for it is broken) | |
302 metacity_hack |= 2; | |
303 } | |
304 XFree(args); | |
305 if (wm && (metacity_hack == 1)) | |
306 { | |
307 // metacity reports that it supports layers, but it is not really truth :-) | |
308 wm ^= vo_wm_LAYER; | |
309 mp_msg(MSGT_VO, MSGL_V, | |
310 "[x11] Using workaround for Metacity bugs.\n"); | |
311 } | |
312 } | |
6009 | 313 // --- netwm |
12582 | 314 if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems)) |
315 { | |
316 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports NetWM.\n"); | |
317 for (i = 0; i < nitems; i++) | |
318 wm |= net_wm_support_state_test(args[i]); | |
319 XFree(args); | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
320 #if 0 |
12582 | 321 // ugly hack for broken OpenBox _NET_WM_STATE_FULLSCREEN support |
322 // (in their implementation it only changes internal state of window, nothing more!!!) | |
323 if (wm & vo_wm_FULLSCREEN) | |
324 { | |
325 if (x11_get_property(XA_BLACKBOX_PID, &args, &nitems)) | |
326 { | |
327 mp_msg(MSGT_VO, MSGL_V, | |
328 "[x11] Detected wm is a broken OpenBox.\n"); | |
329 wm ^= vo_wm_FULLSCREEN; | |
330 } | |
331 XFree(args); | |
332 } | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
333 #endif |
12582 | 334 } |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
335 |
12582 | 336 if (wm == 0) |
337 mp_msg(MSGT_VO, MSGL_V, "[x11] Unknown wm type...\n"); | |
338 return wm; | |
339 } | |
6009 | 340 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
341 static void init_atoms(void) |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
342 { |
12582 | 343 XA_INIT(_NET_SUPPORTED); |
344 XA_INIT(_NET_WM_STATE); | |
345 XA_INIT(_NET_WM_STATE_FULLSCREEN); | |
346 XA_INIT(_NET_WM_STATE_ABOVE); | |
347 XA_INIT(_NET_WM_STATE_STAYS_ON_TOP); | |
348 XA_INIT(_NET_WM_STATE_BELOW); | |
349 XA_INIT(_NET_WM_PID); | |
350 XA_INIT(_WIN_PROTOCOLS); | |
351 XA_INIT(_WIN_LAYER); | |
352 XA_INIT(_WIN_HINTS); | |
353 XA_INIT(_BLACKBOX_PID); | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
354 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
355 |
12582 | 356 int vo_init(void) |
32 | 357 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
358 // int mScreen; |
12582 | 359 int depth, bpp; |
360 unsigned int mask; | |
361 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
362 // 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
|
363 // Display * mDisplay; |
12582 | 364 XImage *mXImage = NULL; |
365 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
366 // Window mRootWin; |
12582 | 367 XWindowAttributes attribs; |
368 char *dispName; | |
12972
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
369 |
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
370 if (vo_rootwin) |
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
371 WinID = 0; // use root win |
32 | 372 |
12582 | 373 if (vo_depthonscreen) |
374 return 1; // already called | |
32 | 375 |
12582 | 376 XSetErrorHandler(x11_errorhandler); |
4812 | 377 |
378 #if 0 | |
12582 | 379 if (!mDisplayName) |
380 if (!(mDisplayName = getenv("DISPLAY"))) | |
381 mDisplayName = strdup(":0.0"); | |
4812 | 382 #else |
12582 | 383 dispName = XDisplayName(mDisplayName); |
4812 | 384 #endif |
385 | |
12582 | 386 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
|
387 |
12582 | 388 mDisplay = XOpenDisplay(dispName); |
389 if (!mDisplay) | |
390 { | |
391 mp_msg(MSGT_VO, MSGL_ERR, | |
392 "vo: couldn't open the X11 display (%s)!\n", dispName); | |
393 return 0; | |
394 } | |
395 mScreen = DefaultScreen(mDisplay); // Screen ID. | |
396 mRootWin = RootWindow(mDisplay, mScreen); // Root window ID. | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
397 |
12582 | 398 init_atoms(); |
399 | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
400 #ifdef HAVE_XINERAMA |
12582 | 401 if (XineramaIsActive(mDisplay)) |
402 { | |
403 XineramaScreenInfo *screens; | |
404 int num_screens; | |
3990 | 405 |
12582 | 406 screens = XineramaQueryScreens(mDisplay, &num_screens); |
407 if (xinerama_screen >= num_screens) | |
408 xinerama_screen = 0; | |
409 if (!vo_screenwidth) | |
410 vo_screenwidth = screens[xinerama_screen].width; | |
411 if (!vo_screenheight) | |
412 vo_screenheight = screens[xinerama_screen].height; | |
413 xinerama_x = screens[xinerama_screen].x_org; | |
414 xinerama_y = screens[xinerama_screen].y_org; | |
4017 | 415 |
12582 | 416 XFree(screens); |
417 } else | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
418 #endif |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
419 #ifdef HAVE_XF86VM |
12582 | 420 { |
421 int clock; | |
422 | |
423 XF86VidModeGetModeLine(mDisplay, mScreen, &clock, &modeline); | |
424 if (!vo_screenwidth) | |
425 vo_screenwidth = modeline.hdisplay; | |
426 if (!vo_screenheight) | |
427 vo_screenheight = modeline.vdisplay; | |
428 } | |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
429 #endif |
12582 | 430 { |
431 if (!vo_screenwidth) | |
432 vo_screenwidth = DisplayWidth(mDisplay, mScreen); | |
433 if (!vo_screenheight) | |
434 vo_screenheight = DisplayHeight(mDisplay, mScreen); | |
435 } | |
436 // get color depth (from root window, or the best visual): | |
437 XGetWindowAttributes(mDisplay, mRootWin, &attribs); | |
438 depth = attribs.depth; | |
1732 | 439 |
12582 | 440 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) |
441 { | |
442 Visual *visual; | |
443 | |
444 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); | |
445 if (depth != -1) | |
446 mXImage = XCreateImage(mDisplay, visual, depth, ZPixmap, | |
447 0, NULL, 1, 1, 8, 1); | |
448 } else | |
449 mXImage = | |
450 XGetImage(mDisplay, mRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap); | |
1732 | 451 |
12582 | 452 vo_depthonscreen = depth; // display depth on screen |
1732 | 453 |
12582 | 454 // get bits/pixel from XImage structure: |
455 if (mXImage == NULL) | |
456 { | |
457 mask = 0; | |
458 } else | |
459 { | |
460 /* | |
461 * for the depth==24 case, the XImage structures might use | |
462 * 24 or 32 bits of data per pixel. The global variable | |
463 * vo_depthonscreen stores the amount of data per pixel in the | |
464 * XImage structure! | |
465 * | |
466 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp? | |
467 */ | |
468 bpp = mXImage->bits_per_pixel; | |
469 if ((vo_depthonscreen + 7) / 8 != (bpp + 7) / 8) | |
470 vo_depthonscreen = bpp; // by A'rpi | |
471 mask = | |
472 mXImage->red_mask | mXImage->green_mask | mXImage->blue_mask; | |
473 mp_msg(MSGT_VO, MSGL_V, | |
474 "vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", mask, | |
475 mXImage->red_mask, mXImage->green_mask, mXImage->blue_mask); | |
476 XDestroyImage(mXImage); | |
477 } | |
478 if (((vo_depthonscreen + 7) / 8) == 2) | |
479 { | |
480 if (mask == 0x7FFF) | |
481 vo_depthonscreen = 15; | |
482 else if (mask == 0xFFFF) | |
483 vo_depthonscreen = 16; | |
484 } | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
485 // XCloseDisplay( mDisplay ); |
1447
e82fbd67ae60
better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents:
1415
diff
changeset
|
486 /* slightly improved local display detection AST */ |
12582 | 487 if (strncmp(dispName, "unix:", 5) == 0) |
488 dispName += 4; | |
489 else if (strncmp(dispName, "localhost:", 10) == 0) | |
490 dispName += 9; | |
491 if (*dispName == ':' && atoi(dispName + 1) < 10) | |
492 mLocalDisplay = 1; | |
493 else | |
494 mLocalDisplay = 0; | |
495 mp_msg(MSGT_VO, MSGL_INFO, | |
496 "vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n", | |
497 vo_screenwidth, vo_screenheight, depth, vo_depthonscreen, | |
498 dispName, mLocalDisplay ? "local" : "remote"); | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
499 |
12582 | 500 vo_wm_type = vo_wm_detect(); |
501 | |
502 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
|
503 |
12582 | 504 fstype_dump(vo_fs_type); |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
505 |
12582 | 506 saver_off(mDisplay); |
507 return 1; | |
32 | 508 } |
509 | |
12582 | 510 void vo_uninit(void) |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
511 { |
12582 | 512 if (!mDisplay) |
513 { | |
514 mp_msg(MSGT_VO, MSGL_V, | |
515 "vo: x11 uninit called but X11 not inited..\n"); | |
516 return; | |
517 } | |
6077 | 518 // if( !vo_depthonscreen ) return; |
12582 | 519 mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n"); |
520 XSetErrorHandler(NULL); | |
521 XCloseDisplay(mDisplay); | |
522 vo_depthonscreen = 0; | |
523 mDisplay = NULL; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
524 } |
4436 | 525 |
9380 | 526 #include "../osdep/keycodes.h" |
32 | 527 #include "wskeys.h" |
528 | |
529 extern void mplayer_put_key(int code); | |
530 | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
531 #ifdef XF86XK_AudioPause |
12582 | 532 void vo_x11_putkey_ext(int keysym) |
533 { | |
534 switch (keysym) | |
535 { | |
536 case XF86XK_AudioPause: | |
537 mplayer_put_key(KEY_XF86_PAUSE); | |
538 break; | |
539 case XF86XK_AudioStop: | |
540 mplayer_put_key(KEY_XF86_STOP); | |
541 break; | |
542 case XF86XK_AudioPrev: | |
543 mplayer_put_key(KEY_XF86_PREV); | |
544 break; | |
545 case XF86XK_AudioNext: | |
546 mplayer_put_key(KEY_XF86_NEXT); | |
547 break; | |
548 default: | |
549 break; | |
550 } | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
551 } |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
552 #endif |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
553 |
12582 | 554 void vo_x11_putkey(int key) |
555 { | |
556 switch (key) | |
557 { | |
558 case wsLeft: | |
559 mplayer_put_key(KEY_LEFT); | |
560 break; | |
561 case wsRight: | |
562 mplayer_put_key(KEY_RIGHT); | |
563 break; | |
564 case wsUp: | |
565 mplayer_put_key(KEY_UP); | |
566 break; | |
567 case wsDown: | |
568 mplayer_put_key(KEY_DOWN); | |
569 break; | |
570 case wsSpace: | |
571 mplayer_put_key(' '); | |
572 break; | |
573 case wsEscape: | |
574 mplayer_put_key(KEY_ESC); | |
575 break; | |
576 case wsEnter: | |
577 mplayer_put_key(KEY_ENTER); | |
578 break; | |
579 case wsBackSpace: | |
580 mplayer_put_key(KEY_BS); | |
581 break; | |
582 case wsDelete: | |
583 mplayer_put_key(KEY_DELETE); | |
584 break; | |
585 case wsInsert: | |
586 mplayer_put_key(KEY_INSERT); | |
587 break; | |
588 case wsHome: | |
589 mplayer_put_key(KEY_HOME); | |
590 break; | |
591 case wsEnd: | |
592 mplayer_put_key(KEY_END); | |
593 break; | |
594 case wsPageUp: | |
595 mplayer_put_key(KEY_PAGE_UP); | |
596 break; | |
597 case wsPageDown: | |
598 mplayer_put_key(KEY_PAGE_DOWN); | |
599 break; | |
600 case wsF1: | |
601 mplayer_put_key(KEY_F + 1); | |
602 break; | |
603 case wsF2: | |
604 mplayer_put_key(KEY_F + 2); | |
605 break; | |
606 case wsF3: | |
607 mplayer_put_key(KEY_F + 3); | |
608 break; | |
609 case wsF4: | |
610 mplayer_put_key(KEY_F + 4); | |
611 break; | |
612 case wsF5: | |
613 mplayer_put_key(KEY_F + 5); | |
614 break; | |
615 case wsF6: | |
616 mplayer_put_key(KEY_F + 6); | |
617 break; | |
618 case wsF7: | |
619 mplayer_put_key(KEY_F + 7); | |
620 break; | |
621 case wsF8: | |
622 mplayer_put_key(KEY_F + 8); | |
623 break; | |
624 case wsF9: | |
625 mplayer_put_key(KEY_F + 9); | |
626 break; | |
627 case wsF10: | |
628 mplayer_put_key(KEY_F + 10); | |
629 break; | |
630 case wsF11: | |
631 mplayer_put_key(KEY_F + 11); | |
632 break; | |
633 case wsF12: | |
634 mplayer_put_key(KEY_F + 12); | |
635 break; | |
636 case wsq: | |
637 case wsQ: | |
638 mplayer_put_key('q'); | |
639 break; | |
640 case wsp: | |
641 case wsP: | |
642 mplayer_put_key('p'); | |
643 break; | |
644 case wsMinus: | |
645 case wsGrayMinus: | |
646 mplayer_put_key('-'); | |
647 break; | |
648 case wsPlus: | |
649 case wsGrayPlus: | |
650 mplayer_put_key('+'); | |
651 break; | |
652 case wsGrayMul: | |
653 case wsMul: | |
654 mplayer_put_key('*'); | |
655 break; | |
656 case wsGrayDiv: | |
657 case wsDiv: | |
658 mplayer_put_key('/'); | |
659 break; | |
660 case wsLess: | |
661 mplayer_put_key('<'); | |
662 break; | |
663 case wsMore: | |
664 mplayer_put_key('>'); | |
665 break; | |
666 case wsGray0: | |
667 mplayer_put_key(KEY_KP0); | |
668 break; | |
669 case wsGrayEnd: | |
670 case wsGray1: | |
671 mplayer_put_key(KEY_KP1); | |
672 break; | |
673 case wsGrayDown: | |
674 case wsGray2: | |
675 mplayer_put_key(KEY_KP2); | |
676 break; | |
677 case wsGrayPgDn: | |
678 case wsGray3: | |
679 mplayer_put_key(KEY_KP3); | |
680 break; | |
681 case wsGrayLeft: | |
682 case wsGray4: | |
683 mplayer_put_key(KEY_KP4); | |
684 break; | |
685 case wsGray5Dup: | |
686 case wsGray5: | |
687 mplayer_put_key(KEY_KP5); | |
688 break; | |
689 case wsGrayRight: | |
690 case wsGray6: | |
691 mplayer_put_key(KEY_KP6); | |
692 break; | |
693 case wsGrayHome: | |
694 case wsGray7: | |
695 mplayer_put_key(KEY_KP7); | |
696 break; | |
697 case wsGrayUp: | |
698 case wsGray8: | |
699 mplayer_put_key(KEY_KP8); | |
700 break; | |
701 case wsGrayPgUp: | |
702 case wsGray9: | |
703 mplayer_put_key(KEY_KP9); | |
704 break; | |
705 case wsGrayDecimal: | |
706 mplayer_put_key(KEY_KPDEC); | |
707 break; | |
708 case wsGrayInsert: | |
709 mplayer_put_key(KEY_KPINS); | |
710 break; | |
711 case wsGrayDelete: | |
712 mplayer_put_key(KEY_KPDEL); | |
713 break; | |
714 case wsGrayEnter: | |
715 mplayer_put_key(KEY_KPENTER); | |
716 break; | |
717 case wsm: | |
718 case wsM: | |
719 mplayer_put_key('m'); | |
720 break; | |
721 case wso: | |
722 case wsO: | |
723 mplayer_put_key('o'); | |
724 break; | |
10936
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
725 |
12582 | 726 case wsGrave: |
727 mplayer_put_key('`'); | |
728 break; | |
729 case wsTilde: | |
730 mplayer_put_key('~'); | |
731 break; | |
732 case wsExclSign: | |
733 mplayer_put_key('!'); | |
734 break; | |
735 case wsAt: | |
736 mplayer_put_key('@'); | |
737 break; | |
738 case wsHash: | |
739 mplayer_put_key('#'); | |
740 break; | |
741 case wsDollar: | |
742 mplayer_put_key('$'); | |
743 break; | |
744 case wsPercent: | |
745 mplayer_put_key('%'); | |
746 break; | |
747 case wsCircumflex: | |
748 mplayer_put_key('^'); | |
749 break; | |
750 case wsAmpersand: | |
751 mplayer_put_key('&'); | |
752 break; | |
753 case wsobracket: | |
754 mplayer_put_key('('); | |
755 break; | |
756 case wscbracket: | |
757 mplayer_put_key(')'); | |
758 break; | |
759 case wsUnder: | |
760 mplayer_put_key('_'); | |
761 break; | |
762 case wsocbracket: | |
763 mplayer_put_key('{'); | |
764 break; | |
765 case wsccbracket: | |
766 mplayer_put_key('}'); | |
767 break; | |
768 case wsColon: | |
769 mplayer_put_key(':'); | |
770 break; | |
771 case wsSemicolon: | |
772 mplayer_put_key(';'); | |
773 break; | |
774 case wsDblQuote: | |
775 mplayer_put_key('\"'); | |
776 break; | |
777 case wsAcute: | |
778 mplayer_put_key('\''); | |
779 break; | |
780 case wsComma: | |
781 mplayer_put_key(','); | |
782 break; | |
783 case wsPoint: | |
784 mplayer_put_key('.'); | |
785 break; | |
786 case wsQuestSign: | |
787 mplayer_put_key('?'); | |
788 break; | |
789 case wsBSlash: | |
790 mplayer_put_key('\\'); | |
791 break; | |
792 case wsPipe: | |
793 mplayer_put_key('|'); | |
794 break; | |
795 case wsEqual: | |
796 mplayer_put_key('='); | |
797 break; | |
798 case wsosbrackets: | |
799 mplayer_put_key('['); | |
800 break; | |
801 case wscsbrackets: | |
802 mplayer_put_key(']'); | |
803 break; | |
10936
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
804 |
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
805 |
12582 | 806 default: |
807 if ((key >= 'a' && key <= 'z') || (key >= 'A' && key <= 'Z') || | |
808 (key >= '0' && key <= '9')) | |
809 mplayer_put_key(key); | |
810 } | |
369 | 811 |
32 | 812 } |
813 | |
814 | |
815 // ----- Motif header: ------- | |
816 | |
1236 | 817 #define MWM_HINTS_FUNCTIONS (1L << 0) |
818 #define MWM_HINTS_DECORATIONS (1L << 1) | |
819 #define MWM_HINTS_INPUT_MODE (1L << 2) | |
820 #define MWM_HINTS_STATUS (1L << 3) | |
821 | |
822 #define MWM_FUNC_ALL (1L << 0) | |
823 #define MWM_FUNC_RESIZE (1L << 1) | |
824 #define MWM_FUNC_MOVE (1L << 2) | |
825 #define MWM_FUNC_MINIMIZE (1L << 3) | |
826 #define MWM_FUNC_MAXIMIZE (1L << 4) | |
827 #define MWM_FUNC_CLOSE (1L << 5) | |
828 | |
829 #define MWM_DECOR_ALL (1L << 0) | |
830 #define MWM_DECOR_BORDER (1L << 1) | |
831 #define MWM_DECOR_RESIZEH (1L << 2) | |
832 #define MWM_DECOR_TITLE (1L << 3) | |
833 #define MWM_DECOR_MENU (1L << 4) | |
834 #define MWM_DECOR_MINIMIZE (1L << 5) | |
835 #define MWM_DECOR_MAXIMIZE (1L << 6) | |
836 | |
837 #define MWM_INPUT_MODELESS 0 | |
838 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 | |
839 #define MWM_INPUT_SYSTEM_MODAL 2 | |
840 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 | |
841 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL | |
842 | |
843 #define MWM_TEAROFF_WINDOW (1L<<0) | |
32 | 844 |
845 typedef struct | |
846 { | |
12582 | 847 long flags; |
848 long functions; | |
849 long decorations; | |
850 long input_mode; | |
851 long state; | |
32 | 852 } MotifWmHints; |
853 | |
854 extern MotifWmHints vo_MotifWmHints; | |
12582 | 855 extern Atom vo_MotifHints; |
856 extern int vo_depthonscreen; | |
857 extern int vo_screenwidth; | |
858 extern int vo_screenheight; | |
32 | 859 |
12582 | 860 static MotifWmHints vo_MotifWmHints; |
861 static Atom vo_MotifHints = None; | |
32 | 862 |
12582 | 863 void vo_x11_decoration(Display * vo_Display, Window w, int d) |
32 | 864 { |
12582 | 865 static unsigned int olddecor = MWM_DECOR_ALL; |
866 static unsigned int oldfuncs = | |
867 MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | | |
868 MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; | |
869 Atom mtype; | |
870 int mformat; | |
871 unsigned long mn, mb; | |
872 | |
873 if (!WinID) | |
874 return; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
875 |
12582 | 876 if (vo_fsmode & 8) |
877 { | |
878 XSetTransientForHint(vo_Display, w, | |
879 RootWindow(vo_Display, mScreen)); | |
880 } | |
881 | |
882 vo_MotifHints = XInternAtom(vo_Display, "_MOTIF_WM_HINTS", 0); | |
883 if (vo_MotifHints != None) | |
884 { | |
885 if (!d) | |
886 { | |
887 MotifWmHints *mhints = NULL; | |
1415 | 888 |
12582 | 889 XGetWindowProperty(vo_Display, w, vo_MotifHints, 0, 20, False, |
890 vo_MotifHints, &mtype, &mformat, &mn, | |
891 &mb, (unsigned char **) &mhints); | |
892 if (mhints) | |
893 { | |
894 if (mhints->flags & MWM_HINTS_DECORATIONS) | |
895 olddecor = mhints->decorations; | |
896 if (mhints->flags & MWM_HINTS_FUNCTIONS) | |
897 oldfuncs = mhints->functions; | |
898 XFree(mhints); | |
899 } | |
900 } | |
12096 | 901 |
12582 | 902 memset(&vo_MotifWmHints, 0, sizeof(MotifWmHints)); |
903 vo_MotifWmHints.flags = | |
904 MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; | |
905 if (d) | |
906 { | |
907 vo_MotifWmHints.functions = oldfuncs; | |
908 d = olddecor; | |
909 } | |
4993 | 910 #if 0 |
12582 | 911 vo_MotifWmHints.decorations = |
912 d | ((vo_fsmode & 2) ? 0 : MWM_DECOR_MENU); | |
4993 | 913 #else |
12582 | 914 vo_MotifWmHints.decorations = |
915 d | ((vo_fsmode & 2) ? MWM_DECOR_MENU : 0); | |
4993 | 916 #endif |
12582 | 917 XChangeProperty(vo_Display, w, vo_MotifHints, vo_MotifHints, 32, |
918 PropModeReplace, | |
919 (unsigned char *) &vo_MotifWmHints, | |
920 (vo_fsmode & 4) ? 4 : 5); | |
921 } | |
32 | 922 } |
923 | |
12582 | 924 void vo_x11_classhint(Display * display, Window window, char *name) |
925 { | |
926 XClassHint wmClass; | |
927 pid_t pid = getpid(); | |
928 | |
929 wmClass.res_name = name; | |
930 wmClass.res_class = "MPlayer"; | |
931 XSetClassHint(display, window, &wmClass); | |
932 XChangeProperty(display, window, XA_NET_WM_PID, XA_CARDINAL, 32, | |
933 PropModeReplace, (unsigned char *) &pid, 1); | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
934 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
935 |
12582 | 936 Window vo_window = None; |
937 GC vo_gc = NULL; | |
938 GC f_gc = NULL; | |
4993 | 939 XSizeHints vo_hint; |
4795 | 940 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
941 #ifdef HAVE_NEW_GUI |
12582 | 942 void vo_setwindow(Window w, GC g) |
943 { | |
944 vo_window = w; | |
945 vo_gc = g; | |
946 } | |
723 | 947 #endif |
948 | |
6095 | 949 void vo_x11_uninit() |
4437 | 950 { |
7111 | 951 saver_on(mDisplay); |
12582 | 952 if (vo_window != None) |
953 vo_showcursor(mDisplay, vo_window); | |
4742 | 954 |
12582 | 955 if (f_gc) |
956 { | |
957 XFreeGC(mDisplay, f_gc); | |
958 f_gc = NULL; | |
959 } | |
4437 | 960 #ifdef HAVE_NEW_GUI |
961 /* destroy window only if it's not controlled by GUI */ | |
12582 | 962 if (!use_gui) |
4437 | 963 #endif |
964 { | |
12582 | 965 if (vo_gc) |
966 { | |
967 XSetBackground(mDisplay, vo_gc, 0); | |
968 XFreeGC(mDisplay, vo_gc); | |
969 vo_gc = NULL; | |
970 } | |
971 if (vo_window != None) | |
972 { | |
973 XClearWindow(mDisplay, vo_window); | |
974 if (WinID < 0) | |
975 { | |
976 XEvent xev; | |
977 | |
978 XUnmapWindow(mDisplay, vo_window); | |
979 XDestroyWindow(mDisplay, vo_window); | |
980 do | |
981 { | |
982 XNextEvent(mDisplay, &xev); | |
983 } | |
984 while (xev.type != DestroyNotify | |
985 || xev.xdestroywindow.event != vo_window); | |
986 } | |
987 vo_window = None; | |
988 } | |
989 vo_fs = 0; | |
990 vo_old_width = vo_old_height = 0; | |
4437 | 991 } |
992 } | |
993 | |
12582 | 994 int vo_mouse_timer_const = 30; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
995 static int vo_mouse_counter = 30; |
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
996 |
12582 | 997 int vo_x11_check_events(Display * mydisplay) |
998 { | |
999 int ret = 0; | |
1000 XEvent Event; | |
1001 char buf[100]; | |
1002 KeySym keySym; | |
1003 static XComposeStatus stat; | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
1004 |
32 | 1005 // unsigned long vo_KeyTable[512]; |
1006 | |
12582 | 1007 if ((vo_mouse_autohide) && (--vo_mouse_counter == 0)) |
1008 vo_hidecursor(mydisplay, vo_window); | |
6095 | 1009 |
12582 | 1010 while (XPending(mydisplay)) |
1011 { | |
1012 XNextEvent(mydisplay, &Event); | |
1013 #ifdef HAVE_NEW_GUI | |
1014 if (use_gui) | |
1015 { | |
1016 guiGetEvent(0, (char *) &Event); | |
1017 if (vo_window != Event.xany.window) | |
1018 continue; | |
1019 } | |
1020 #endif | |
6095 | 1021 // printf("\rEvent.type=%X \n",Event.type); |
12582 | 1022 switch (Event.type) |
1023 { | |
1024 case Expose: | |
1025 ret |= VO_EVENT_EXPOSE; | |
1026 break; | |
1027 case ConfigureNotify: | |
1028 // if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break; | |
1029 // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break; | |
1030 if (vo_window == None) | |
1031 break; | |
1032 vo_dwidth = Event.xconfigure.width; | |
1033 vo_dheight = Event.xconfigure.height; | |
4812 | 1034 #if 0 |
12582 | 1035 /* when resizing, x and y are zero :( */ |
1036 vo_dx = Event.xconfigure.x; | |
1037 vo_dy = Event.xconfigure.y; | |
4812 | 1038 #else |
12582 | 1039 { |
1040 Window root; | |
1041 int foo; | |
1042 Window win; | |
1043 | |
1044 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, | |
1045 &foo /*width */ , &foo /*height */ , &foo, | |
1046 &foo); | |
1047 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, | |
1048 &vo_dx, &vo_dy, &win); | |
1049 } | |
1050 #endif | |
1051 ret |= VO_EVENT_RESIZE; | |
1052 break; | |
1053 case KeyPress: | |
1054 { | |
1055 int key; | |
1056 | |
1057 XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, | |
1058 &stat); | |
1059 #ifdef XF86XK_AudioPause | |
1060 vo_x11_putkey_ext(keySym); | |
1061 #endif | |
1062 key = | |
1063 ((keySym & 0xff00) != | |
1064 0 ? ((keySym & 0x00ff) + 256) : (keySym)); | |
1065 #ifdef HAVE_NEW_GUI | |
1066 if ((use_gui) && (key == wsEnter)) | |
1067 break; | |
4812 | 1068 #endif |
12582 | 1069 vo_x11_putkey(key); |
1070 ret |= VO_EVENT_KEYPRESS; | |
1071 } | |
1072 break; | |
1073 case MotionNotify: | |
1074 if (vo_mouse_autohide) | |
1075 { | |
1076 vo_showcursor(mydisplay, vo_window); | |
1077 vo_mouse_counter = vo_mouse_timer_const; | |
1078 } | |
1079 break; | |
1080 case ButtonPress: | |
1081 if (vo_mouse_autohide) | |
1082 { | |
1083 vo_showcursor(mydisplay, vo_window); | |
1084 vo_mouse_counter = vo_mouse_timer_const; | |
1085 } | |
1086 // Ignore mouse whell press event | |
1087 if (Event.xbutton.button > 3) | |
1088 { | |
1089 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
1090 break; | |
1091 } | |
1092 #ifdef HAVE_NEW_GUI | |
1093 // Ignor mouse button 1 - 3 under gui | |
1094 if (use_gui && (Event.xbutton.button >= 1) | |
1095 && (Event.xbutton.button <= 3)) | |
1096 break; | |
1097 #endif | |
1098 mplayer_put_key((MOUSE_BTN0 + Event.xbutton.button - | |
1099 1) | MP_KEY_DOWN); | |
1100 break; | |
1101 case ButtonRelease: | |
1102 if (vo_mouse_autohide) | |
1103 { | |
1104 vo_showcursor(mydisplay, vo_window); | |
1105 vo_mouse_counter = vo_mouse_timer_const; | |
1106 } | |
1107 #ifdef HAVE_NEW_GUI | |
1108 // Ignor mouse button 1 - 3 under gui | |
1109 if (use_gui && (Event.xbutton.button >= 1) | |
1110 && (Event.xbutton.button <= 3)) | |
1111 break; | |
1112 #endif | |
1113 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
1114 break; | |
1115 case PropertyNotify: | |
1116 { | |
1117 char *name = | |
1118 XGetAtomName(mydisplay, Event.xproperty.atom); | |
1119 | |
1120 if (!name) | |
1121 break; | |
1122 | |
6046 | 1123 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); |
12582 | 1124 |
1125 XFree(name); | |
1126 } | |
1127 break; | |
1128 case MapNotify: | |
1129 vo_hint.win_gravity = old_gravity; | |
1130 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
1131 vo_fs_flip = 0; | |
1132 break; | |
1133 } | |
1134 } | |
1135 return ret; | |
32 | 1136 } |
1137 | |
12582 | 1138 void vo_x11_sizehint(int x, int y, int width, int height, int max) |
4993 | 1139 { |
12582 | 1140 vo_hint.flags = PPosition | PSize | PWinGravity; |
1141 if (vo_keepaspect) | |
1142 { | |
1143 vo_hint.flags |= PAspect; | |
1144 vo_hint.min_aspect.x = width; | |
1145 vo_hint.min_aspect.y = height; | |
1146 vo_hint.max_aspect.x = width; | |
1147 vo_hint.max_aspect.y = height; | |
1148 } | |
8692
604f0cde816c
X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents:
8676
diff
changeset
|
1149 |
12582 | 1150 vo_hint.x = x; |
1151 vo_hint.y = y; | |
1152 vo_hint.width = width; | |
1153 vo_hint.height = height; | |
1154 if (max) | |
1155 { | |
1156 vo_hint.max_width = width; | |
1157 vo_hint.max_height = height; | |
1158 vo_hint.flags |= PMaxSize; | |
1159 } else | |
1160 { | |
1161 vo_hint.max_width = 0; | |
1162 vo_hint.max_height = 0; | |
1163 } | |
11995 | 1164 |
12582 | 1165 // set min height/width to 4 to avoid off by one errors |
1166 // and because mga_vid requires a minial size of 4 pixel | |
1167 vo_hint.min_width = vo_hint.min_height = 4; | |
1168 vo_hint.flags |= PMinSize; | |
11995 | 1169 |
12582 | 1170 vo_hint.win_gravity = StaticGravity; |
1171 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
4993 | 1172 } |
1173 | |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1174 static int vo_x11_get_gnome_layer(Display * mDisplay, Window win) |
8866 | 1175 { |
12582 | 1176 Atom type; |
1177 int format; | |
1178 unsigned long nitems; | |
1179 unsigned long bytesafter; | |
1180 unsigned short *args = NULL; | |
8866 | 1181 |
12582 | 1182 if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384, |
1183 False, AnyPropertyType, &type, &format, &nitems, | |
1184 &bytesafter, | |
1185 (unsigned char **) &args) == Success | |
1186 && nitems > 0 && args) | |
1187 { | |
1188 mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n", | |
1189 *args); | |
1190 return *args; | |
1191 } | |
1192 return WIN_LAYER_NORMAL; | |
8866 | 1193 } |
1194 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1195 // |
12582 | 1196 Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot, |
1197 Visual * vis, int x, int y, | |
1198 unsigned int width, unsigned int height, | |
1199 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
|
1200 { |
12582 | 1201 unsigned long xswamask = CWBackingStore | CWBorderPixel; |
1202 XSetWindowAttributes xswa; | |
1203 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
|
1204 |
12582 | 1205 if (col_map != CopyFromParent) |
1206 { | |
1207 xswa.colormap = col_map; | |
1208 xswamask |= CWColormap; | |
1209 } | |
1210 xswa.background_pixel = 0; | |
1211 xswa.border_pixel = 0; | |
1212 xswa.backing_store = Always; | |
1213 xswa.bit_gravity = StaticGravity; | |
1214 | |
1215 ret_win = | |
1216 XCreateWindow(mDisplay, mRootWin, x, y, width, height, 0, depth, | |
1217 CopyFromParent, vis, xswamask, &xswa); | |
1218 if (!f_gc) | |
1219 f_gc = XCreateGC(mDisplay, ret_win, 0, 0); | |
1220 XSetForeground(mDisplay, f_gc, 0); | |
1221 | |
1222 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
|
1223 } |
12582 | 1224 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1225 |
12582 | 1226 void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window, |
1227 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
|
1228 { |
12582 | 1229 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
|
1230 |
12582 | 1231 if (!f_gc) |
1232 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
|
1233 |
12582 | 1234 u_dheight = use_fs ? vo_screenheight : vo_dheight; |
1235 u_dwidth = use_fs ? vo_screenwidth : vo_dwidth; | |
1236 if ((u_dheight <= img_height) && (u_dwidth <= img_width)) | |
1237 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
|
1238 |
12582 | 1239 left_ov = (u_dheight - img_height) / 2; |
1240 left_ov2 = (u_dwidth - img_width) / 2; | |
1241 | |
1242 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov); | |
1243 XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1, | |
1244 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
|
1245 |
12582 | 1246 if (u_dwidth > img_width) |
1247 { | |
1248 XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2, | |
1249 img_height); | |
1250 XFillRectangle(mDisplay, vo_window, f_gc, u_dwidth - left_ov2 - 1, | |
1251 left_ov, left_ov2, img_height); | |
1252 } | |
1253 | |
1254 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
|
1255 } |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1256 |
12582 | 1257 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
|
1258 { |
12582 | 1259 if (!f_gc) |
1260 return; | |
1261 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth, | |
1262 vo_screenheight); | |
1263 // | |
1264 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
|
1265 } |
12582 | 1266 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1267 |
12582 | 1268 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
|
1269 { |
12582 | 1270 if (WinID >= 0) |
1271 return; | |
8864 | 1272 |
12582 | 1273 if (vo_fs_type & vo_wm_LAYER) |
1274 { | |
1275 XClientMessageEvent xev; | |
1276 | |
1277 if (!orig_layer) | |
1278 orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window); | |
8866 | 1279 |
12582 | 1280 memset(&xev, 0, sizeof(xev)); |
1281 xev.type = ClientMessage; | |
1282 xev.display = mDisplay; | |
1283 xev.window = vo_window; | |
1284 xev.message_type = XA_WIN_LAYER; | |
1285 xev.format = 32; | |
1286 xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer | |
1287 xev.data.l[1] = CurrentTime; | |
1288 mp_msg(MSGT_VO, MSGL_V, | |
1289 "[x11] Layered style stay on top (layer %d).\n", | |
1290 xev.data.l[0]); | |
1291 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, | |
1292 (XEvent *) & xev); | |
1293 } else if (vo_fs_type & vo_wm_NETWM) | |
1294 { | |
1295 XClientMessageEvent xev; | |
1296 char *state; | |
8645 | 1297 |
12582 | 1298 memset(&xev, 0, sizeof(xev)); |
1299 xev.type = ClientMessage; | |
1300 xev.message_type = XA_NET_WM_STATE; | |
1301 xev.display = mDisplay; | |
1302 xev.window = vo_window; | |
1303 xev.format = 32; | |
1304 xev.data.l[0] = layer; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1305 |
12582 | 1306 if (vo_fs_type & vo_wm_STAYS_ON_TOP) |
1307 xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP; | |
1308 else if (vo_fs_type & vo_wm_ABOVE) | |
1309 xev.data.l[1] = XA_NET_WM_STATE_ABOVE; | |
1310 else if (vo_fs_type & vo_wm_FULLSCREEN) | |
1311 xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN; | |
1312 else if (vo_fs_type & vo_wm_BELOW) | |
1313 // This is not fallback. We can safely assume that situation where | |
1314 // only NETWM_STATE_BELOW is supported and others not, doesn't exist. | |
1315 xev.data.l[1] = XA_NET_WM_STATE_BELOW; | |
1316 | |
1317 XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask, | |
1318 (XEvent *) & xev); | |
1319 state = XGetAtomName(mDisplay, xev.data.l[1]); | |
1320 mp_msg(MSGT_VO, MSGL_V, | |
1321 "[x11] NET style stay on top (layer %d). Using state %s.\n", | |
1322 layer, state); | |
1323 XFree(state); | |
1324 } | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1325 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1326 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1327 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
|
1328 { |
12582 | 1329 int i; |
1330 int type = supported; | |
1331 | |
1332 if (vo_fstype_list) | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1333 { |
12582 | 1334 i = 0; |
1335 for (i = 0; vo_fstype_list[i]; i++) | |
1336 { | |
1337 int neg = 0; | |
1338 char *arg = vo_fstype_list[i]; | |
1339 | |
1340 if (vo_fstype_list[i][0] == '-') | |
1341 { | |
1342 neg = 1; | |
1343 arg = vo_fstype_list[i] + 1; | |
1344 } | |
1345 | |
1346 if (!strncmp(arg, "layer", 5)) | |
1347 { | |
1348 if (!neg && (arg[5] == '=')) | |
1349 { | |
1350 char *endptr = NULL; | |
1351 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
|
1352 |
12582 | 1353 if (endptr && *endptr == '\0' && layer >= 0 |
1354 && layer <= 15) | |
1355 fs_layer = layer; | |
1356 } | |
1357 if (neg) | |
1358 type &= ~vo_wm_LAYER; | |
1359 else | |
1360 type |= vo_wm_LAYER; | |
1361 } else if (!strcmp(arg, "above")) | |
1362 { | |
1363 if (neg) | |
1364 type &= ~vo_wm_ABOVE; | |
1365 else | |
1366 type |= vo_wm_ABOVE; | |
1367 } else if (!strcmp(arg, "fullscreen")) | |
1368 { | |
1369 if (neg) | |
1370 type &= ~vo_wm_FULLSCREEN; | |
1371 else | |
1372 type |= vo_wm_FULLSCREEN; | |
1373 } else if (!strcmp(arg, "stays_on_top")) | |
1374 { | |
1375 if (neg) | |
1376 type &= ~vo_wm_STAYS_ON_TOP; | |
1377 else | |
1378 type |= vo_wm_STAYS_ON_TOP; | |
1379 } else if (!strcmp(arg, "below")) | |
1380 { | |
1381 if (neg) | |
1382 type &= ~vo_wm_BELOW; | |
1383 else | |
1384 type |= vo_wm_BELOW; | |
1385 } else if (!strcmp(arg, "netwm")) | |
1386 { | |
1387 if (neg) | |
1388 type &= ~vo_wm_NETWM; | |
1389 else | |
1390 type |= vo_wm_NETWM; | |
1391 } else if (!strcmp(arg, "none")) | |
1392 return 0; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1393 } |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1394 } |
5919 | 1395 |
12582 | 1396 return type; |
4981 | 1397 } |
1398 | |
12582 | 1399 void vo_x11_fullscreen(void) |
11542 | 1400 { |
12582 | 1401 int x, y, w, h; |
1402 | |
1403 if (WinID >= 0 || vo_fs_flip) | |
1404 return; | |
1405 | |
1406 if (vo_fs) | |
1407 { | |
1408 // fs->win | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1409 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
|
1410 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1411 if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1412 return; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1413 x = vo_old_x; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1414 y = vo_old_y; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1415 w = vo_old_width; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1416 h = vo_old_height; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1417 } |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1418 |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1419 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
|
1420 vo_fs = VO_FALSE; |
12582 | 1421 } else |
1422 { | |
1423 // win->fs | |
1424 vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH | |
1425 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1426 vo_fs = VO_TRUE; |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1427 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
|
1428 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1429 if (vo_old_width && |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1430 (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) && |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1431 (vo_dheight == vo_screenheight && vo_dheight != vo_old_height)) |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1432 return; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1433 vo_old_x = vo_dx; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1434 vo_old_y = vo_dy; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1435 vo_old_width = vo_dwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1436 vo_old_height = vo_dheight; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1437 x = 0; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1438 y = 0; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1439 w = vo_screenwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1440 h = vo_screenheight; |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1441 } |
12582 | 1442 } |
1443 { | |
1444 long dummy; | |
1445 | |
1446 XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy); | |
1447 if (!(vo_hint.flags & PWinGravity)) | |
1448 old_gravity = NorthWestGravity; | |
1449 else | |
1450 old_gravity = vo_hint.win_gravity; | |
1451 } | |
1452 if (vo_wm_type == 0 && !(vo_fsmode & 16)) | |
1453 { | |
1454 XUnmapWindow(mDisplay, vo_window); // required for MWM | |
1455 XWithdrawWindow(mDisplay, vo_window, mScreen); | |
1456 vo_fs_flip = 1; | |
1457 } | |
1458 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1459 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
|
1460 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1461 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
|
1462 vo_x11_sizehint(x, y, w, h, 0); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1463 vo_x11_setlayer(mDisplay, vo_window, vo_fs); |
12582 | 1464 |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1465 if ((!(vo_fs)) & vo_ontop) |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1466 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); |
12582 | 1467 |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1468 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1469 } |
12582 | 1470 #ifdef HAVE_XINERAMA |
1471 vo_x11_xinerama_move(mDisplay, vo_window); | |
1472 #endif | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1473 |
12582 | 1474 XMapRaised(mDisplay, vo_window); |
1475 XRaiseWindow(mDisplay, vo_window); | |
1476 XFlush(mDisplay); | |
1477 } | |
1478 | |
1479 void vo_x11_ontop(void) | |
1480 { | |
1481 vo_ontop = (!(vo_ontop)); | |
1482 | |
1483 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 1484 } |
1485 | |
9695 | 1486 /* |
1487 * XScreensaver stuff | |
1488 */ | |
1489 | |
1490 static int got_badwindow; | |
1491 static XErrorHandler old_handler; | |
1492 | |
12582 | 1493 static int badwindow_handler(Display * dpy, XErrorEvent * error) |
9695 | 1494 { |
1495 if (error->error_code != BadWindow) | |
12582 | 1496 return (*old_handler) (dpy, error); |
9695 | 1497 |
1498 got_badwindow = True; | |
1499 return 0; | |
1500 } | |
1501 | |
12582 | 1502 static Window find_xscreensaver_window(Display * dpy) |
9695 | 1503 { |
1504 int i; | |
1505 Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); | |
1506 Window root2, parent, *kids; | |
1507 Window retval = 0; | |
1508 Atom xs_version; | |
1509 unsigned int nkids = 0; | |
1510 | |
1511 xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); | |
1512 | |
1513 if (!(xs_version != None && | |
1514 XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) && | |
12582 | 1515 kids && nkids)) |
1516 return 0; | |
9695 | 1517 |
1518 old_handler = XSetErrorHandler(badwindow_handler); | |
1519 | |
12582 | 1520 for (i = 0; i < nkids; i++) |
1521 { | |
1522 Atom type; | |
1523 int format; | |
1524 unsigned long nitems, bytesafter; | |
1525 char *v; | |
1526 int status; | |
9695 | 1527 |
1528 got_badwindow = False; | |
12582 | 1529 status = |
1530 XGetWindowProperty(dpy, kids[i], xs_version, 0, 200, False, | |
1531 XA_STRING, &type, &format, &nitems, | |
1532 &bytesafter, (unsigned char **) &v); | |
1533 XSync(dpy, False); | |
1534 if (got_badwindow) | |
1535 status = BadWindow; | |
9695 | 1536 |
12582 | 1537 if (status == Success && type != None) |
1538 { | |
1539 retval = kids[i]; | |
1540 break; | |
1541 } | |
9695 | 1542 } |
1543 XFree(kids); | |
1544 XSetErrorHandler(old_handler); | |
1545 | |
1546 return retval; | |
1547 } | |
1548 | |
1549 static Window xs_windowid = 0; | |
1550 static Atom deactivate; | |
1551 static Atom screensaver; | |
1552 | |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1553 static unsigned int time_last; |
9695 | 1554 |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1555 void xscreensaver_heartbeat(void) |
9695 | 1556 { |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1557 unsigned int time = GetTimerMS(); |
9695 | 1558 XEvent ev; |
1559 | |
10920 | 1560 if (mDisplay && xs_windowid && |
12582 | 1561 ((time - time_last) > 30000 || (time - time_last) < 0)) |
1562 { | |
1563 time_last = time; | |
9695 | 1564 |
12582 | 1565 ev.xany.type = ClientMessage; |
1566 ev.xclient.display = mDisplay; | |
1567 ev.xclient.window = xs_windowid; | |
1568 ev.xclient.message_type = screensaver; | |
1569 ev.xclient.format = 32; | |
1570 memset(&ev.xclient.data, 0, sizeof(ev.xclient.data)); | |
1571 ev.xclient.data.l[0] = (long) deactivate; | |
9695 | 1572 |
12582 | 1573 mp_msg(MSGT_VO, MSGL_DBG2, "Pinging xscreensaver.\n"); |
1574 XSendEvent(mDisplay, xs_windowid, False, 0L, &ev); | |
1575 XSync(mDisplay, False); | |
9695 | 1576 } |
1577 } | |
1578 | |
12582 | 1579 static void xscreensaver_disable(Display * dpy) |
9695 | 1580 { |
12582 | 1581 mp_msg(MSGT_VO, MSGL_DBG2, "xscreensaver_disable()\n"); |
9695 | 1582 |
1583 xs_windowid = find_xscreensaver_window(dpy); | |
12582 | 1584 if (!xs_windowid) |
1585 { | |
1586 mp_msg(MSGT_VO, MSGL_INFO, | |
1587 "xscreensaver_disable: Could not find xscreensaver window.\n"); | |
1588 return; | |
9695 | 1589 } |
12582 | 1590 mp_msg(MSGT_VO, MSGL_INFO, |
9695 | 1591 "xscreensaver_disable: xscreensaver wid=%d.\n", xs_windowid); |
1592 | |
1593 deactivate = XInternAtom(dpy, "DEACTIVATE", False); | |
1594 screensaver = XInternAtom(dpy, "SCREENSAVER", False); | |
1595 } | |
1596 | |
1597 static void xscreensaver_enable(void) | |
1598 { | |
1599 xs_windowid = 0; | |
1600 } | |
1601 | |
1602 /* | |
1603 * End of XScreensaver stuff | |
1604 */ | |
1605 | |
12582 | 1606 void saver_on(Display * mDisplay) |
1607 { | |
324 | 1608 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1609 #ifdef HAVE_XDPMS |
324 | 1610 int nothing; |
12582 | 1611 |
324 | 1612 if (dpms_disabled) |
1613 { | |
12582 | 1614 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1615 { | |
1616 if (!DPMSEnable(mDisplay)) | |
1617 { // restoring power saving settings | |
1618 mp_msg(MSGT_VO, MSGL_WARN, "DPMS not available?\n"); | |
1619 } else | |
1620 { | |
741 | 1621 // DPMS does not seem to be enabled unless we call DPMSInfo |
12582 | 1622 BOOL onoff; |
1623 CARD16 state; | |
1624 | |
1625 DPMSForceLevel(mDisplay, DPMSModeOn); | |
1626 DPMSInfo(mDisplay, &state, &onoff); | |
1627 if (onoff) | |
1628 { | |
1629 mp_msg(MSGT_VO, MSGL_INFO, | |
1630 "Successfully enabled DPMS\n"); | |
1631 } else | |
1632 { | |
1633 mp_msg(MSGT_VO, MSGL_WARN, "Could not enable DPMS\n"); | |
741 | 1634 } |
1635 } | |
12582 | 1636 } |
1637 dpms_disabled = 0; | |
324 | 1638 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1639 #endif |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1640 |
324 | 1641 if (timeout_save) |
1642 { | |
12582 | 1643 int dummy, interval, prefer_blank, allow_exp; |
1644 | |
1645 XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, | |
1646 &allow_exp); | |
1647 XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, | |
1648 allow_exp); | |
1649 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, | |
1650 &allow_exp); | |
1651 timeout_save = 0; | |
324 | 1652 } |
1653 | |
12582 | 1654 if (stop_xscreensaver) |
1655 xscreensaver_enable(); | |
1656 if (kdescreensaver_was_running && stop_xscreensaver) | |
1657 { | |
1658 system | |
1659 ("dcop kdesktop KScreensaverIface enable true 2>/dev/null >/dev/null"); | |
1660 kdescreensaver_was_running = 0; | |
8354
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1661 } |
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1662 |
6303 | 1663 |
324 | 1664 } |
1665 | |
12582 | 1666 void saver_off(Display * mDisplay) |
1667 { | |
324 | 1668 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1669 int interval, prefer_blank, allow_exp; |
12582 | 1670 |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1671 #ifdef HAVE_XDPMS |
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1672 int nothing; |
324 | 1673 |
1674 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) | |
1675 { | |
12582 | 1676 BOOL onoff; |
1677 CARD16 state; | |
1678 | |
1679 DPMSInfo(mDisplay, &state, &onoff); | |
1680 if (onoff) | |
1681 { | |
1682 Status stat; | |
1683 | |
1684 mp_msg(MSGT_VO, MSGL_INFO, "Disabling DPMS\n"); | |
1685 dpms_disabled = 1; | |
1686 stat = DPMSDisable(mDisplay); // monitor powersave off | |
1687 mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat); | |
1688 } | |
324 | 1689 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1690 #endif |
12582 | 1691 if (!timeout_save) |
1692 { | |
1693 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, | |
1694 &allow_exp); | |
1695 if (timeout_save) | |
1696 XSetScreenSaver(mDisplay, 0, interval, prefer_blank, | |
1697 allow_exp); | |
8097 | 1698 } |
12582 | 1699 // turning off screensaver |
1700 if (stop_xscreensaver) | |
1701 xscreensaver_disable(mDisplay); | |
8354
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1702 if (stop_xscreensaver && !kdescreensaver_was_running) |
8a0b6e083280
This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents:
8215
diff
changeset
|
1703 { |
12582 | 1704 kdescreensaver_was_running = |
1705 (system | |
1706 ("dcop kdesktop KScreensaverIface isEnabled 2>/dev/null | sed 's/1/true/g' | grep true 2>/dev/null >/dev/null") | |
1707 == 0); | |
1708 if (kdescreensaver_was_running) | |
1709 system | |
1710 ("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
|
1711 } |
326 | 1712 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1713 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1714 static XErrorHandler old_handler = NULL; |
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1715 static int selectinput_err = 0; |
12582 | 1716 static int x11_selectinput_errorhandler(Display * display, |
1717 XErrorEvent * event) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1718 { |
12582 | 1719 if (event->error_code == BadAccess) |
1720 { | |
1721 selectinput_err = 1; | |
1722 mp_msg(MSGT_VO, MSGL_ERR, | |
1723 "X11 error: BadAccess during XSelectInput Call\n"); | |
1724 mp_msg(MSGT_VO, MSGL_ERR, | |
1725 "X11 error: The 'ButtonPressMask' mask of specified window has probably already used by another appication (see man XSelectInput)\n"); | |
1726 /* If you think mplayer should shutdown with this error, comments out following line */ | |
1727 return 0; | |
1728 } | |
1729 if (old_handler != NULL) | |
1730 old_handler(display, event); | |
1731 else | |
1732 x11_errorhandler(display, event); | |
1733 return 0; | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1734 } |
3990 | 1735 |
12582 | 1736 void vo_x11_selectinput_witherr(Display * display, Window w, |
1737 long event_mask) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1738 { |
12582 | 1739 XSync(display, False); |
1740 old_handler = XSetErrorHandler(x11_selectinput_errorhandler); | |
1741 selectinput_err = 0; | |
1742 if (vo_nomouse_input) | |
1743 { | |
1744 XSelectInput(display, w, | |
1745 event_mask & | |
1746 (~(ButtonPressMask | ButtonReleaseMask))); | |
1747 } else | |
1748 { | |
1749 XSelectInput(display, w, event_mask); | |
1750 } | |
1751 XSync(display, False); | |
1752 XSetErrorHandler(old_handler); | |
1753 if (selectinput_err) | |
1754 { | |
1755 mp_msg(MSGT_VO, MSGL_ERR, | |
1756 "X11 error: MPlayer discards mouse control (reconfiguring)\n"); | |
1757 XSelectInput(display, w, | |
1758 event_mask & | |
1759 (~ | |
1760 (ButtonPressMask | ButtonReleaseMask | | |
1761 PointerMotionMask))); | |
1762 } | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1763 } |
3990 | 1764 |
1765 #ifdef HAVE_XINERAMA | |
12582 | 1766 void vo_x11_xinerama_move(Display * dsp, Window w) |
3990 | 1767 { |
12582 | 1768 if (XineramaIsActive(dsp) && !geometry_xy_changed) |
1769 { | |
1770 /* printf("XXXX Xinerama screen: x: %hd y: %hd\n",xinerama_x,xinerama_y); */ | |
1771 XMoveWindow(dsp, w, xinerama_x, xinerama_y); | |
1772 } | |
3990 | 1773 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1774 #endif |
3990 | 1775 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1776 #ifdef HAVE_XF86VM |
12582 | 1777 void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width, |
1778 int *modeline_height) | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1779 { |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1780 unsigned int vm_event, vm_error; |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1781 unsigned int vm_ver, vm_rev; |
12582 | 1782 int i, j, have_vm = 0; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1783 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1784 int modecount; |
12582 | 1785 |
1786 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) | |
1787 { | |
1788 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
1789 mp_msg(MSGT_VO, MSGL_V, "XF86VidMode Extension v%i.%i\n", vm_ver, | |
1790 vm_rev); | |
1791 have_vm = 1; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1792 } else |
12582 | 1793 mp_msg(MSGT_VO, MSGL_WARN, |
1794 "XF86VidMode Extenstion not available.\n"); | |
1795 | |
1796 if (have_vm) | |
1797 { | |
1798 if (vidmodes == NULL) | |
1799 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1800 &vidmodes); | |
1801 j = 0; | |
1802 *modeline_width = vidmodes[0]->hdisplay; | |
1803 *modeline_height = vidmodes[0]->vdisplay; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1804 |
12582 | 1805 for (i = 1; i < modecount; i++) |
1806 if ((vidmodes[i]->hdisplay >= X) | |
1807 && (vidmodes[i]->vdisplay >= Y)) | |
1808 if ((vidmodes[i]->hdisplay <= *modeline_width) | |
1809 && (vidmodes[i]->vdisplay <= *modeline_height)) | |
1810 { | |
1811 *modeline_width = vidmodes[i]->hdisplay; | |
1812 *modeline_height = vidmodes[i]->vdisplay; | |
1813 j = i; | |
1814 } | |
1815 | |
1816 mp_msg(MSGT_VO, MSGL_INFO, | |
1817 "XF86VM: Selected video mode %dx%d for image size %dx%d.\n", | |
1818 *modeline_width, *modeline_height, X, Y); | |
1819 XF86VidModeLockModeSwitch(mDisplay, mScreen, 0); | |
1820 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1821 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1822 X = (vo_screenwidth - *modeline_width) / 2; | |
1823 Y = (vo_screenheight - *modeline_height) / 2; | |
1824 XF86VidModeSetViewPort(mDisplay, mScreen, X, Y); | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1825 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1826 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1827 |
12582 | 1828 void vo_vm_close(Display * dpy) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1829 { |
12582 | 1830 #ifdef HAVE_NEW_GUI |
1831 if (vidmodes != NULL && vo_window != None) | |
1832 #else | |
1833 if (vidmodes != NULL) | |
1834 #endif | |
1835 { | |
1836 int i, modecount; | |
1837 int screen; | |
1838 | |
1839 screen = DefaultScreen(dpy); | |
5019 | 1840 |
12582 | 1841 free(vidmodes); |
1842 vidmodes = NULL; | |
1843 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1844 &vidmodes); | |
1845 for (i = 0; i < modecount; i++) | |
1846 if ((vidmodes[i]->hdisplay == vo_screenwidth) | |
1847 && (vidmodes[i]->vdisplay == vo_screenheight)) | |
1848 { | |
1849 mp_msg(MSGT_VO, MSGL_INFO, | |
1850 "Returning to original mode %dx%d\n", | |
1851 vo_screenwidth, vo_screenheight); | |
1852 break; | |
1853 } | |
5019 | 1854 |
12582 | 1855 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); |
1856 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); | |
1857 free(vidmodes); | |
1858 vidmodes = NULL; | |
1859 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1860 } |
3990 | 1861 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1862 |
12582 | 1863 #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
|
1864 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1865 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1866 /* |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1867 * 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
|
1868 * 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
|
1869 * 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
|
1870 * >= 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
|
1871 */ |
12582 | 1872 int vo_find_depth_from_visuals(Display * dpy, int screen, |
1873 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
|
1874 { |
12582 | 1875 XVisualInfo visual_tmpl; |
1876 XVisualInfo *visuals; | |
1877 int nvisuals, i; | |
1878 int bestvisual = -1; | |
1879 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
|
1880 |
12582 | 1881 visual_tmpl.screen = screen; |
1882 visual_tmpl.class = TrueColor; | |
1883 visuals = XGetVisualInfo(dpy, | |
1884 VisualScreenMask | VisualClassMask, | |
1885 &visual_tmpl, &nvisuals); | |
1886 if (visuals != NULL) | |
1887 { | |
1888 for (i = 0; i < nvisuals; i++) | |
1889 { | |
1890 mp_msg(MSGT_VO, MSGL_V, | |
1891 "vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n", | |
1892 visuals[i].visualid, visuals[i].depth, | |
1893 visuals[i].red_mask, visuals[i].green_mask, | |
1894 visuals[i].blue_mask); | |
1895 /* | |
1896 * save the visual index and it's depth, if this is the first | |
1897 * truecolor visul, or a visual that is 'preferred' over the | |
1898 * previous 'best' visual | |
1899 */ | |
1900 if (bestvisual_depth == -1 | |
1901 || (visuals[i].depth >= 15 | |
1902 && (visuals[i].depth < bestvisual_depth | |
1903 || bestvisual_depth < 15))) | |
1904 { | |
1905 bestvisual = i; | |
1906 bestvisual_depth = visuals[i].depth; | |
1907 } | |
1908 } | |
1909 | |
1910 if (bestvisual != -1 && visual_return != NULL) | |
1911 *visual_return = visuals[bestvisual].visual; | |
1912 | |
1913 XFree(visuals); | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1914 } |
12582 | 1915 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
|
1916 } |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1917 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1918 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1919 static Colormap cmap = None; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1920 static XColor cols[256]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1921 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
|
1922 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1923 |
12582 | 1924 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
|
1925 { |
12582 | 1926 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
|
1927 |
12582 | 1928 if (vinfo->class != DirectColor) |
1929 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, | |
1930 AllocNone); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1931 |
12582 | 1932 /* can this function get called twice or more? */ |
1933 if (cmap) | |
1934 return cmap; | |
1935 cm_size = vinfo->colormap_size; | |
1936 red_mask = vinfo->red_mask; | |
1937 green_mask = vinfo->green_mask; | |
1938 blue_mask = vinfo->blue_mask; | |
1939 ru = (red_mask & (red_mask - 1)) ^ red_mask; | |
1940 gu = (green_mask & (green_mask - 1)) ^ green_mask; | |
1941 bu = (blue_mask & (blue_mask - 1)) ^ blue_mask; | |
1942 rvu = 65536ull * ru / (red_mask + ru); | |
1943 gvu = 65536ull * gu / (green_mask + gu); | |
1944 bvu = 65536ull * bu / (blue_mask + bu); | |
1945 r = g = b = 0; | |
1946 rv = gv = bv = 0; | |
1947 m = DoRed | DoGreen | DoBlue; | |
1948 for (k = 0; k < cm_size; k++) | |
1949 { | |
1950 int t; | |
1951 | |
1952 cols[k].pixel = r | g | b; | |
1953 cols[k].red = rv; | |
1954 cols[k].green = gv; | |
1955 cols[k].blue = bv; | |
1956 cols[k].flags = m; | |
1957 t = (r + ru) & red_mask; | |
1958 if (t < r) | |
1959 m &= ~DoRed; | |
1960 r = t; | |
1961 t = (g + gu) & green_mask; | |
1962 if (t < g) | |
1963 m &= ~DoGreen; | |
1964 g = t; | |
1965 t = (b + bu) & blue_mask; | |
1966 if (t < b) | |
1967 m &= ~DoBlue; | |
1968 b = t; | |
1969 rv += rvu; | |
1970 gv += gvu; | |
1971 bv += bvu; | |
1972 } | |
1973 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll); | |
1974 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1975 return cmap; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1976 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1977 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1978 /* |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1979 * 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
|
1980 * 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
|
1981 * 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
|
1982 * 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
|
1983 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1984 /* 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
|
1985 static int vo_gamma = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1986 static int vo_brightness = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1987 static int vo_contrast = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1988 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1989 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1990 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
|
1991 { |
12582 | 1992 float gamma, brightness, contrast; |
1993 float rf, gf, bf; | |
1994 int k; | |
1995 | |
1996 /* | |
1997 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case | |
1998 * of TrueColor-ed window but be careful: | |
1999 * unlike the colormaps, which are private for the X client | |
2000 * who created them and thus automatically destroyed on client | |
2001 * disconnect, this gamma ramp is a system-wide (X-server-wide) | |
2002 * setting and _must_ be restored before the process exit. | |
2003 * Unforunately when the process crashes (or get killed | |
2004 * for some reason) it is impossible to restore the setting, | |
2005 * and such behaviour could be rather annoying for the users. | |
2006 */ | |
2007 if (cmap == None) | |
2008 return VO_NOTAVAIL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2009 |
12582 | 2010 if (!strcasecmp(name, "brightness")) |
2011 vo_brightness = value; | |
2012 else if (!strcasecmp(name, "contrast")) | |
2013 vo_contrast = value; | |
2014 else if (!strcasecmp(name, "gamma")) | |
2015 vo_gamma = value; | |
2016 else | |
2017 return VO_NOTIMPL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2018 |
12582 | 2019 brightness = 0.01 * vo_brightness; |
2020 contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4); | |
2021 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
|
2022 |
12582 | 2023 rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask; |
2024 gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) / | |
2025 green_mask; | |
2026 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
|
2027 |
12582 | 2028 /* now recalculate the colormap using the newly set value */ |
2029 for (k = 0; k < cm_size; k++) | |
2030 { | |
2031 float s; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2032 |
12582 | 2033 s = pow(rf * k, gamma); |
2034 s = (s - 0.5) * contrast + 0.5; | |
2035 s += brightness; | |
2036 if (s < 0) | |
2037 s = 0; | |
2038 if (s > 1) | |
2039 s = 1; | |
2040 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
|
2041 |
12582 | 2042 s = pow(gf * k, gamma); |
2043 s = (s - 0.5) * contrast + 0.5; | |
2044 s += brightness; | |
2045 if (s < 0) | |
2046 s = 0; | |
2047 if (s > 1) | |
2048 s = 1; | |
2049 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
|
2050 |
12582 | 2051 s = pow(bf * k, gamma); |
2052 s = (s - 0.5) * contrast + 0.5; | |
2053 s += brightness; | |
2054 if (s < 0) | |
2055 s = 0; | |
2056 if (s > 1) | |
2057 s = 1; | |
2058 cols[k].blue = (unsigned short) (s * 65535); | |
2059 } | |
2060 | |
2061 XStoreColors(mDisplay, cmap, cols, cm_size); | |
2062 XFlush(mDisplay); | |
2063 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2064 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2065 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2066 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
|
2067 { |
12582 | 2068 if (cmap == None) |
2069 return VO_NOTAVAIL; | |
2070 if (!strcasecmp(name, "brightness")) | |
2071 *value = vo_brightness; | |
2072 else if (!strcasecmp(name, "contrast")) | |
2073 *value = vo_contrast; | |
2074 else if (!strcasecmp(name, "gamma")) | |
2075 *value = vo_gamma; | |
2076 else | |
2077 return VO_NOTIMPL; | |
2078 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2079 } |
12582 | 2080 |
10359 | 2081 #ifdef HAVE_XV |
2082 int vo_xv_set_eq(uint32_t xv_port, char *name, int value) | |
2083 { | |
2084 XvAttribute *attributes; | |
12582 | 2085 int i, howmany, xv_atom; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2086 |
10359 | 2087 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
|
2088 |
10359 | 2089 /* get available attributes */ |
2090 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2091 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2092 if (attributes[i].flags & XvSettable) |
2093 { | |
2094 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2095 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2096 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2097 if (xv_atom != None) |
2098 { | |
2099 int hue = 0, port_value, port_min, port_max; | |
10359 | 2100 |
12582 | 2101 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2102 (!strcasecmp(name, "brightness"))) | |
2103 port_value = value; | |
2104 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2105 (!strcasecmp(name, "contrast"))) | |
2106 port_value = value; | |
2107 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2108 (!strcasecmp(name, "saturation"))) | |
2109 port_value = value; | |
2110 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2111 (!strcasecmp(name, "hue"))) | |
2112 { | |
2113 port_value = value; | |
2114 hue = 1; | |
2115 } else | |
10359 | 2116 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2117 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2118 (!strcasecmp(name, "red_intensity"))) | |
2119 port_value = value; | |
2120 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2121 && (!strcasecmp(name, "green_intensity"))) | |
2122 port_value = value; | |
2123 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2124 && (!strcasecmp(name, "blue_intensity"))) | |
2125 port_value = value; | |
2126 else | |
2127 continue; | |
2128 | |
2129 port_min = attributes[i].min_value; | |
2130 port_max = attributes[i].max_value; | |
10359 | 2131 |
12582 | 2132 /* nvidia hue workaround */ |
2133 if (hue && port_min == 0 && port_max == 360) | |
2134 { | |
2135 port_value = | |
2136 (port_value >= | |
2137 0) ? (port_value - 100) : (port_value + 100); | |
10359 | 2138 } |
12582 | 2139 // -100 -> min |
2140 // 0 -> (max+min)/2 | |
2141 // +100 -> max | |
2142 port_value = | |
2143 (port_value + 100) * (port_max - port_min) / 200 + | |
2144 port_min; | |
2145 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value); | |
2146 return (VO_TRUE); | |
2147 } | |
2148 } | |
2149 return (VO_FALSE); | |
10359 | 2150 } |
2151 | |
2152 int vo_xv_get_eq(uint32_t xv_port, char *name, int *value) | |
2153 { | |
12582 | 2154 |
10359 | 2155 XvAttribute *attributes; |
12582 | 2156 int i, howmany, xv_atom; |
10359 | 2157 |
2158 /* get available attributes */ | |
2159 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2160 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2161 if (attributes[i].flags & XvGettable) |
2162 { | |
2163 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2164 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2165 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2166 if (xv_atom != None) |
2167 { | |
2168 int val, port_value = 0, port_min, port_max; | |
10359 | 2169 |
12582 | 2170 XvGetPortAttribute(mDisplay, xv_port, xv_atom, |
2171 &port_value); | |
2172 | |
2173 port_min = attributes[i].min_value; | |
2174 port_max = attributes[i].max_value; | |
2175 val = | |
2176 (port_value - port_min) * 200 / (port_max - port_min) - | |
2177 100; | |
10359 | 2178 |
12582 | 2179 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2180 (!strcasecmp(name, "brightness"))) | |
2181 *value = val; | |
2182 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2183 (!strcasecmp(name, "contrast"))) | |
2184 *value = val; | |
2185 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2186 (!strcasecmp(name, "saturation"))) | |
2187 *value = val; | |
2188 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2189 (!strcasecmp(name, "hue"))) | |
2190 { | |
2191 /* nasty nvidia detect */ | |
2192 if (port_min == 0 && port_max == 360) | |
2193 *value = (val >= 0) ? (val - 100) : (val + 100); | |
2194 else | |
2195 *value = val; | |
2196 } else | |
10359 | 2197 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2198 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2199 (!strcasecmp(name, "red_intensity"))) | |
2200 *value = val; | |
2201 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2202 && (!strcasecmp(name, "green_intensity"))) | |
2203 *value = val; | |
2204 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2205 && (!strcasecmp(name, "blue_intensity"))) | |
2206 *value = val; | |
2207 else | |
2208 continue; | |
10359 | 2209 |
12582 | 2210 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", |
2211 name, *value); | |
2212 return (VO_TRUE); | |
2213 } | |
2214 } | |
2215 return (VO_FALSE); | |
10359 | 2216 } |
2217 | |
2218 #endif |