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