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