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