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