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