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