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