Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 36542:1163104c8adb
Improve the dialog for subtitle encodings selection.
Prettify the dialog by moving the option for unicode subtitles up,
and place it below the subtitle encodings combo box.
In this way, everything related to subtitle encodings is grouped
together.
As a result, we'll need the label unconditionally.
author | ib |
---|---|
date | Sun, 19 Jan 2014 14:46:33 +0000 |
parents | b7e306c04a3f |
children | 598ef7d90b78 |
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); | |
36377
b7e306c04a3f
Fix hang if uninit is called while the window is still hidden.
reimar
parents:
36307
diff
changeset
|
781 if (WinID < 0 && vo_window != mRootWin) |
12582 | 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 { |
36168 | 831 int key = 0; |
35867 | 832 uint8_t buf[16] = {0}; |
12582 | 833 KeySym keySym; |
834 static XComposeStatus stat; | |
34301
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
835 static int ctrl_state; |
27343 | 836 #ifdef CONFIG_GUI |
12582 | 837 if (use_gui) |
838 { | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
839 gui(GUI_HANDLE_X_EVENT, event); |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
840 if (vo_window != event->xany.window) |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
841 return 0; |
12582 | 842 } |
843 #endif | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
844 switch (event->type) |
12582 | 845 { |
846 case Expose: | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
847 return VO_EVENT_EXPOSE; |
12582 | 848 case ConfigureNotify: |
849 if (vo_window == None) | |
850 break; | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
851 return check_resize(); |
12582 | 852 case KeyPress: |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
853 case KeyRelease: |
12582 | 854 { |
35867 | 855 int key, utf8; |
12582 | 856 |
27343 | 857 #ifdef CONFIG_GUI |
14001 | 858 if ( use_gui ) { break; } |
859 #endif | |
860 | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
861 XLookupString(&event->xkey, buf, sizeof(buf), &keySym, |
12582 | 862 &stat); |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
863 key = |
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
864 ((keySym & 0xff00) != |
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
865 0 ? ((keySym & 0x00ff) + 256) : (keySym)); |
35966 | 866 utf8 = buf[0] > 0xc0 ? to_utf8(buf) : 0; |
35867 | 867 if (utf8) key = 0; |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
868 if (key == wsLeftCtrl || key == wsRightCtrl) { |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
869 ctrl_state = event->type == KeyPress; |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
870 mplayer_put_key(KEY_CTRL | |
34301
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
871 (ctrl_state ? MP_KEY_DOWN : 0)); |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
872 } else if (event->type == KeyRelease) { |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
873 break; |
34301
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
874 } |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
875 // 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
|
876 // sync with reality. |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
877 // This usually happens when a shortcut involving CTRL |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
878 // 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
|
879 if (ctrl_state != !!(event->xkey.state & 4)) { |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
880 ctrl_state = !!(event->xkey.state & 4); |
34301
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
881 mplayer_put_key(KEY_CTRL | |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
882 (ctrl_state ? MP_KEY_DOWN : 0)); |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
883 } |
d3488ac22468
Add workaround for CTRL key getting stuck for X11 backend
reimar
parents:
34292
diff
changeset
|
884 if (!vo_x11_putkey_ext(keySym)) { |
35867 | 885 if (utf8) mplayer_put_key(utf8); |
886 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
|
887 } |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
888 return VO_EVENT_KEYPRESS; |
12582 | 889 } |
890 break; | |
891 case MotionNotify: | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
892 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
|
893 |
36167 | 894 return VO_EVENT_MOUSE; |
12582 | 895 case ButtonPress: |
36168 | 896 key = MP_KEY_DOWN; |
12582 | 897 case ButtonRelease: |
27343 | 898 #ifdef CONFIG_GUI |
21938 | 899 // Ignore mouse button 1-3 under GUI. |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
900 if (use_gui && (event->xbutton.button >= 1) |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
901 && (event->xbutton.button <= 3)) |
36167 | 902 return VO_EVENT_MOUSE; |
12582 | 903 #endif |
36168 | 904 key |= MOUSE_BTN0 + event->xbutton.button - 1; |
905 mplayer_put_key(key); | |
36167 | 906 return VO_EVENT_MOUSE; |
12582 | 907 case PropertyNotify: |
908 { | |
909 char *name = | |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
910 XGetAtomName(mydisplay, event->xproperty.atom); |
12582 | 911 |
912 if (!name) | |
913 break; | |
914 | |
915 XFree(name); | |
916 } | |
917 break; | |
918 case MapNotify: | |
35809
98b531e7c38e
Don't destroy a -wid window's WM_NORMAL_HINTS property information.
ib
parents:
35640
diff
changeset
|
919 if (WinID < 0) { |
35810 | 920 vo_hint.win_gravity = old_gravity; |
921 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
922 vo_fs_flip = 0; | |
35809
98b531e7c38e
Don't destroy a -wid window's WM_NORMAL_HINTS property information.
ib
parents:
35640
diff
changeset
|
923 } |
12582 | 924 break; |
31122 | 925 case DestroyNotify: |
926 mp_msg(MSGT_VO, MSGL_WARN, "Our window was destroyed, exiting\n"); | |
927 mplayer_put_key(KEY_CLOSE_WIN); | |
928 break; | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
929 case ClientMessage: |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
930 if (event->xclient.message_type == XAWM_PROTOCOLS && |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
931 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
|
932 mplayer_put_key(KEY_CLOSE_WIN); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
933 break; |
12582 | 934 } |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
935 return 0; |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
936 } |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
937 |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
938 int vo_x11_check_events(Display * mydisplay) |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
939 { |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
940 int ret = 0; |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
941 XEvent Event; |
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 if (vo_mouse_autohide && mouse_waiting_hide && |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
944 (GetTimerMS() - mouse_timer >= 1000)) { |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
945 vo_hidecursor(mydisplay, vo_window); |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
946 mouse_waiting_hide = 0; |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
947 } |
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 (WinID > 0) |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
950 ret |= check_resize(); |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
951 while (XPending(mydisplay)) |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
952 { |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
953 XNextEvent(mydisplay, &Event); |
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
954 ret |= handle_x11_event(mydisplay, &Event); |
12582 | 955 } |
36167 | 956 if (vo_mouse_autohide && (ret & VO_EVENT_MOUSE)) |
957 { | |
958 vo_showcursor(mydisplay, vo_window); | |
959 mouse_waiting_hide = 1; | |
960 mouse_timer = GetTimerMS(); | |
961 } | |
12582 | 962 return ret; |
32 | 963 } |
964 | |
13843 | 965 /** |
966 * \brief sets the size and position of the non-fullscreen window. | |
967 */ | |
968 void vo_x11_nofs_sizepos(int x, int y, int width, int height) | |
969 { | |
24312
716b7751e7ad
Make sure aspect hint is adjusted on aspect change
reimar
parents:
24311
diff
changeset
|
970 vo_x11_sizehint(x, y, width, height, 0); |
13843 | 971 if (vo_fs) { |
972 vo_old_x = x; | |
973 vo_old_y = y; | |
974 vo_old_width = width; | |
975 vo_old_height = height; | |
976 } | |
977 else | |
13871 | 978 { |
31536 | 979 vo_dwidth = width; |
980 vo_dheight = height; | |
981 XMoveResizeWindow(mDisplay, vo_window, x, y, width, height); | |
13871 | 982 } |
13843 | 983 } |
984 | |
12582 | 985 void vo_x11_sizehint(int x, int y, int width, int height, int max) |
4993 | 986 { |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
987 vo_hint.flags = 0; |
12582 | 988 if (vo_keepaspect) |
989 { | |
990 vo_hint.flags |= PAspect; | |
991 vo_hint.min_aspect.x = width; | |
992 vo_hint.min_aspect.y = height; | |
993 vo_hint.max_aspect.x = width; | |
994 vo_hint.max_aspect.y = height; | |
995 } | |
8692
604f0cde816c
X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents:
8676
diff
changeset
|
996 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
997 vo_hint.flags |= PPosition | PSize; |
12582 | 998 vo_hint.x = x; |
999 vo_hint.y = y; | |
1000 vo_hint.width = width; | |
1001 vo_hint.height = height; | |
1002 if (max) | |
1003 { | |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1004 vo_hint.flags |= PMaxSize; |
12582 | 1005 vo_hint.max_width = width; |
1006 vo_hint.max_height = height; | |
1007 } else | |
1008 { | |
1009 vo_hint.max_width = 0; | |
1010 vo_hint.max_height = 0; | |
1011 } | |
11995 | 1012 |
21938 | 1013 // Set minimum height/width to 4 to avoid off-by-one errors |
1014 // 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
|
1015 vo_hint.flags |= PMinSize; |
12582 | 1016 vo_hint.min_width = vo_hint.min_height = 4; |
11995 | 1017 |
28063
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1018 // 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
|
1019 // 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
|
1020 // 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
|
1021 vo_hint.flags |= PBaseSize; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1022 vo_hint.base_width = 0 /*width*/; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1023 vo_hint.base_height = 0 /*height*/; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1024 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1025 vo_hint.flags |= PWinGravity; |
12582 | 1026 vo_hint.win_gravity = StaticGravity; |
1027 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
4993 | 1028 } |
1029 | |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1030 static int vo_x11_get_gnome_layer(Display * mDisplay, Window win) |
8866 | 1031 { |
12582 | 1032 Atom type; |
1033 int format; | |
1034 unsigned long nitems; | |
1035 unsigned long bytesafter; | |
1036 unsigned short *args = NULL; | |
8866 | 1037 |
12582 | 1038 if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384, |
1039 False, AnyPropertyType, &type, &format, &nitems, | |
1040 &bytesafter, | |
1041 (unsigned char **) &args) == Success | |
1042 && nitems > 0 && args) | |
1043 { | |
1044 mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n", | |
1045 *args); | |
1046 return *args; | |
1047 } | |
1048 return WIN_LAYER_NORMAL; | |
8866 | 1049 } |
1050 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1051 // |
12582 | 1052 Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot, |
1053 Visual * vis, int x, int y, | |
1054 unsigned int width, unsigned int height, | |
1055 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
|
1056 { |
27815
f92271dc5f17
Remove X11 backing store: this is now a useless flag.
ben
parents:
27713
diff
changeset
|
1057 unsigned long xswamask = CWBorderPixel; |
12582 | 1058 XSetWindowAttributes xswa; |
1059 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
|
1060 |
12582 | 1061 if (col_map != CopyFromParent) |
1062 { | |
1063 xswa.colormap = col_map; | |
1064 xswamask |= CWColormap; | |
1065 } | |
1066 xswa.background_pixel = 0; | |
1067 xswa.border_pixel = 0; | |
27815
f92271dc5f17
Remove X11 backing store: this is now a useless flag.
ben
parents:
27713
diff
changeset
|
1068 xswa.backing_store = NotUseful; |
12582 | 1069 xswa.bit_gravity = StaticGravity; |
1070 | |
1071 ret_win = | |
33435
f7a492ac8d30
Make vo_x11_create_smooth_window() use its parameter mRoot instead
iive
parents:
33419
diff
changeset
|
1072 XCreateWindow(mDisplay, mRoot, x, y, width, height, 0, depth, |
12582 | 1073 CopyFromParent, vis, xswamask, &xswa); |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1074 XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1); |
31356
c3e536cf595b
Consistently use "None" instead of "NULL" for X resources.
reimar
parents:
31328
diff
changeset
|
1075 if (f_gc == None) |
12582 | 1076 f_gc = XCreateGC(mDisplay, ret_win, 0, 0); |
1077 XSetForeground(mDisplay, f_gc, 0); | |
1078 | |
1079 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
|
1080 } |
12582 | 1081 |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1082 /** |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1083 * \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
|
1084 * \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
|
1085 * \param x x position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1086 * \param y y position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1087 * \param width width of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1088 * \param height height of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1089 * \param flags flags for window creation. |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1090 * Only VOFLAG_FULLSCREEN is supported so far. |
23823
513293585949
document "default" behaviour if CopyFromParent is passed as colormap
attila
parents:
23660
diff
changeset
|
1091 * \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
|
1092 * \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
|
1093 * \param title title for the window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1094 * |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1095 * 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
|
1096 * 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
|
1097 */ |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1098 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
|
1099 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
|
1100 Colormap col_map, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1101 const char *classname, const char *title) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1102 { |
36307
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1103 if (flags & VOFLAG_HIDDEN) { |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1104 // unmapped windows cause lots of issues, in particular |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1105 // -geometry might be ignore when finally mapping them etc. |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1106 if (vo_window == None) |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1107 vo_window = mRootWin; |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1108 window_state = VOFLAG_HIDDEN; |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1109 goto final; |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1110 } else if (vo_window == mRootWin && (window_state & VOFLAG_HIDDEN)) { |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1111 vo_window = None; |
a3a1ad19b8b4
On X11 use root window as "hidden" window instead of
reimar
parents:
36168
diff
changeset
|
1112 } |
34292
e60d8bdb4795
X11: update title only on reconfigure instead of at least once per frame.
reimar
parents:
34281
diff
changeset
|
1113 if (vo_wintitle) |
e60d8bdb4795
X11: update title only on reconfigure instead of at least once per frame.
reimar
parents:
34281
diff
changeset
|
1114 title = vo_wintitle; |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1115 if (WinID >= 0) { |
29514
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1116 vo_fs = flags & VOFLAG_FULLSCREEN; |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1117 vo_window = WinID ? (Window)WinID : mRootWin; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1118 if (col_map != CopyFromParent) { |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1119 unsigned long xswamask = CWColormap; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1120 XSetWindowAttributes xswa; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1121 xswa.colormap = col_map; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1122 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
|
1123 XInstallColormap(mDisplay, col_map); |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1124 } |
31539
b07ed23358af
Always request expose events, we have to handle them, the application
reimar
parents:
31538
diff
changeset
|
1125 if (WinID) { |
31556 | 1126 // Expose events can only really be handled by us, so request them. |
1127 // Do not remove existing masks so GUI keeps working. | |
1128 XWindowAttributes attribs; | |
1129 XGetWindowAttributes(mDisplay, vo_window, &attribs); | |
1130 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
1131 attribs.your_event_mask | ExposureMask); | |
31539
b07ed23358af
Always request expose events, we have to handle them, the application
reimar
parents:
31538
diff
changeset
|
1132 } else |
31536 | 1133 // Do not capture events since it might break the parent application |
1134 // if it relies on events being forwarded to the parent of WinID. | |
1135 // It also is consistent with the w32_common.c code. | |
1136 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
1137 StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1138 ButtonPressMask | ButtonReleaseMask | ExposureMask); |
31557 | 1139 |
1140 vo_x11_update_geometry(); | |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1141 goto final; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1142 } |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1143 if (vo_window == None) { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1144 vo_fs = 0; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1145 vo_dwidth = width; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1146 vo_dheight = height; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1147 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
|
1148 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
|
1149 window_state = VOFLAG_HIDDEN; |
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30455
diff
changeset
|
1150 } |
34292
e60d8bdb4795
X11: update title only on reconfigure instead of at least once per frame.
reimar
parents:
34281
diff
changeset
|
1151 XStoreName(mDisplay, vo_window, title); |
34639 | 1152 XChangeProperty(mDisplay, vo_window, XA_NET_WM_NAME, XAUTF8_STRING, |
1153 8, PropModeReplace, title, strlen(title)); | |
30465
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30455
diff
changeset
|
1154 if (window_state & VOFLAG_HIDDEN) { |
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30455
diff
changeset
|
1155 XSizeHints hint; |
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30455
diff
changeset
|
1156 XEvent xev; |
30472
ddce1a6f3c59
Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from window_state.
reimar
parents:
30465
diff
changeset
|
1157 window_state &= ~VOFLAG_HIDDEN; |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1158 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
|
1159 vo_hidecursor(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1160 XSelectInput(mDisplay, vo_window, StructureNotifyMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1161 hint.x = x; hint.y = y; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1162 hint.width = width; hint.height = height; |
31223
4031008a248c
Change code to let Window Manager chose window location by default.
reimar
parents:
31122
diff
changeset
|
1163 hint.flags = PSize; |
4031008a248c
Change code to let Window Manager chose window location by default.
reimar
parents:
31122
diff
changeset
|
1164 if (geometry_xy_changed) |
4031008a248c
Change code to let Window Manager chose window location by default.
reimar
parents:
31122
diff
changeset
|
1165 hint.flags |= PPosition; |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1166 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
27304 | 1167 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
|
1168 // map window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1169 XMapWindow(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1170 // wait for map |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1171 do { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1172 XNextEvent(mDisplay, &xev); |
36166
a6263abe514f
Handle X events even while waiting for a map event.
reimar
parents:
36165
diff
changeset
|
1173 handle_x11_event(mDisplay, &xev); |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1174 } while (xev.type != MapNotify || xev.xmap.event != vo_window); |
33419 | 1175 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
|
1176 vo_x11_selectinput_witherr(mDisplay, vo_window, |
34281
52d927f2b563
X11: support CTRL key and thus key combinations with it.
reimar
parents:
34269
diff
changeset
|
1177 StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1178 ButtonPressMask | ButtonReleaseMask | ExposureMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1179 } |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1180 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
|
1181 if (!geometry_xy_changed) |
4031008a248c
Change code to let Window Manager chose window location by default.
reimar
parents:
31122
diff
changeset
|
1182 vo_x11_update_geometry(); |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1183 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
|
1184 if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN)) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1185 vo_x11_fullscreen(); |
28771
bd24ac0d9fd8
Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
reimar
parents:
28512
diff
changeset
|
1186 else if (vo_fs) { |
bd24ac0d9fd8
Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
reimar
parents:
28512
diff
changeset
|
1187 // 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
|
1188 // 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
|
1189 vo_dwidth = vo_screenwidth; |
bd24ac0d9fd8
Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
reimar
parents:
28512
diff
changeset
|
1190 vo_dheight = vo_screenheight; |
bd24ac0d9fd8
Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
reimar
parents:
28512
diff
changeset
|
1191 } |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1192 final: |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1193 if (vo_gc != None) |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1194 XFreeGC(mDisplay, vo_gc); |
33437
5b1120ddd033
Create empty vo_gc graphic context instead of one with
iive
parents:
33436
diff
changeset
|
1195 vo_gc = XCreateGC(mDisplay, vo_window, 0, NULL); |
5b1120ddd033
Create empty vo_gc graphic context instead of one with
iive
parents:
33436
diff
changeset
|
1196 |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1197 XSync(mDisplay, False); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1198 vo_mouse_autohide = 1; |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1199 } |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1200 |
12582 | 1201 void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window, |
1202 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
|
1203 { |
12582 | 1204 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
|
1205 |
31356
c3e536cf595b
Consistently use "None" instead of "NULL" for X resources.
reimar
parents:
31328
diff
changeset
|
1206 if (f_gc == None) |
12582 | 1207 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
|
1208 |
12582 | 1209 u_dheight = use_fs ? vo_screenheight : vo_dheight; |
1210 u_dwidth = use_fs ? vo_screenwidth : vo_dwidth; | |
1211 if ((u_dheight <= img_height) && (u_dwidth <= img_width)) | |
1212 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
|
1213 |
12582 | 1214 left_ov = (u_dheight - img_height) / 2; |
1215 left_ov2 = (u_dwidth - img_width) / 2; | |
1216 | |
1217 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov); | |
1218 XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1, | |
1219 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
|
1220 |
12582 | 1221 if (u_dwidth > img_width) |
1222 { | |
1223 XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2, | |
1224 img_height); | |
1225 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
|
1226 left_ov, left_ov2 + 1, img_height); |
12582 | 1227 } |
1228 | |
1229 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
|
1230 } |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1231 |
12582 | 1232 void vo_x11_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
|
1233 { |
31356
c3e536cf595b
Consistently use "None" instead of "NULL" for X resources.
reimar
parents:
31328
diff
changeset
|
1234 if (f_gc == None) |
12582 | 1235 return; |
1236 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth, | |
1237 vo_screenheight); | |
1238 // | |
1239 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
|
1240 } |
12582 | 1241 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1242 |
12582 | 1243 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
|
1244 { |
12582 | 1245 if (WinID >= 0) |
1246 return; | |
8864 | 1247 |
12582 | 1248 if (vo_fs_type & vo_wm_LAYER) |
1249 { | |
1250 XClientMessageEvent xev; | |
1251 | |
1252 if (!orig_layer) | |
1253 orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window); | |
8866 | 1254 |
12582 | 1255 memset(&xev, 0, sizeof(xev)); |
1256 xev.type = ClientMessage; | |
1257 xev.display = mDisplay; | |
1258 xev.window = vo_window; | |
1259 xev.message_type = XA_WIN_LAYER; | |
1260 xev.format = 32; | |
1261 xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer | |
1262 xev.data.l[1] = CurrentTime; | |
1263 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1264 "[x11] Layered style stay on top (layer %ld).\n", |
12582 | 1265 xev.data.l[0]); |
1266 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, | |
1267 (XEvent *) & xev); | |
1268 } else if (vo_fs_type & vo_wm_NETWM) | |
1269 { | |
1270 XClientMessageEvent xev; | |
1271 char *state; | |
8645 | 1272 |
12582 | 1273 memset(&xev, 0, sizeof(xev)); |
1274 xev.type = ClientMessage; | |
1275 xev.message_type = XA_NET_WM_STATE; | |
1276 xev.display = mDisplay; | |
1277 xev.window = vo_window; | |
1278 xev.format = 32; | |
1279 xev.data.l[0] = layer; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1280 |
12582 | 1281 if (vo_fs_type & vo_wm_STAYS_ON_TOP) |
1282 xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP; | |
1283 else if (vo_fs_type & vo_wm_ABOVE) | |
1284 xev.data.l[1] = XA_NET_WM_STATE_ABOVE; | |
1285 else if (vo_fs_type & vo_wm_FULLSCREEN) | |
1286 xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN; | |
1287 else if (vo_fs_type & vo_wm_BELOW) | |
21938 | 1288 // This is not fallback. We can safely assume that the situation |
1289 // where only NETWM_STATE_BELOW is supported doesn't exist. | |
12582 | 1290 xev.data.l[1] = XA_NET_WM_STATE_BELOW; |
1291 | |
1292 XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask, | |
1293 (XEvent *) & xev); | |
1294 state = XGetAtomName(mDisplay, xev.data.l[1]); | |
1295 mp_msg(MSGT_VO, MSGL_V, | |
1296 "[x11] NET style stay on top (layer %d). Using state %s.\n", | |
1297 layer, state); | |
1298 XFree(state); | |
1299 } | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1300 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1301 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1302 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
|
1303 { |
12582 | 1304 int i; |
1305 int type = supported; | |
1306 | |
1307 if (vo_fstype_list) | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1308 { |
12582 | 1309 for (i = 0; vo_fstype_list[i]; i++) |
1310 { | |
1311 int neg = 0; | |
1312 char *arg = vo_fstype_list[i]; | |
1313 | |
1314 if (vo_fstype_list[i][0] == '-') | |
1315 { | |
1316 neg = 1; | |
1317 arg = vo_fstype_list[i] + 1; | |
1318 } | |
1319 | |
1320 if (!strncmp(arg, "layer", 5)) | |
1321 { | |
1322 if (!neg && (arg[5] == '=')) | |
1323 { | |
1324 char *endptr = NULL; | |
1325 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
|
1326 |
12582 | 1327 if (endptr && *endptr == '\0' && layer >= 0 |
1328 && layer <= 15) | |
1329 fs_layer = layer; | |
1330 } | |
1331 if (neg) | |
1332 type &= ~vo_wm_LAYER; | |
1333 else | |
1334 type |= vo_wm_LAYER; | |
1335 } else if (!strcmp(arg, "above")) | |
1336 { | |
1337 if (neg) | |
1338 type &= ~vo_wm_ABOVE; | |
1339 else | |
1340 type |= vo_wm_ABOVE; | |
1341 } else if (!strcmp(arg, "fullscreen")) | |
1342 { | |
1343 if (neg) | |
1344 type &= ~vo_wm_FULLSCREEN; | |
1345 else | |
1346 type |= vo_wm_FULLSCREEN; | |
1347 } else if (!strcmp(arg, "stays_on_top")) | |
1348 { | |
1349 if (neg) | |
1350 type &= ~vo_wm_STAYS_ON_TOP; | |
1351 else | |
1352 type |= vo_wm_STAYS_ON_TOP; | |
1353 } else if (!strcmp(arg, "below")) | |
1354 { | |
1355 if (neg) | |
1356 type &= ~vo_wm_BELOW; | |
1357 else | |
1358 type |= vo_wm_BELOW; | |
1359 } else if (!strcmp(arg, "netwm")) | |
1360 { | |
1361 if (neg) | |
1362 type &= ~vo_wm_NETWM; | |
1363 else | |
1364 type |= vo_wm_NETWM; | |
1365 } else if (!strcmp(arg, "none")) | |
29763
752432ff3360
Slightly change behavior of "none" if fstype specification.
corey
parents:
29753
diff
changeset
|
1366 type = 0; // clear; keep parsing |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1367 } |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1368 } |
5919 | 1369 |
12582 | 1370 return type; |
4981 | 1371 } |
1372 | |
27885
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1373 /** |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1374 * \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
|
1375 * \return returns current color depth of vo_window |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1376 */ |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1377 int vo_x11_update_geometry(void) { |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1378 unsigned depth, w, h; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1379 int dummy_int; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1380 Window dummy_win; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1381 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
|
1382 &w, &h, &dummy_int, &depth); |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1383 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
|
1384 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
|
1385 &dummy_win); |
29862
fbb1f57a313e
Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents:
29776
diff
changeset
|
1386 |
27885
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1387 return depth <= INT_MAX ? depth : 0; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1388 } |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1389 |
12582 | 1390 void vo_x11_fullscreen(void) |
11542 | 1391 { |
12582 | 1392 int x, y, w, h; |
29753
75f54a9e4160
Move some variable initializations to the beginning of vo_x11_fullscreen().
diego
parents:
29572
diff
changeset
|
1393 x = vo_old_x; |
75f54a9e4160
Move some variable initializations to the beginning of vo_x11_fullscreen().
diego
parents:
29572
diff
changeset
|
1394 y = vo_old_y; |
75f54a9e4160
Move some variable initializations to the beginning of vo_x11_fullscreen().
diego
parents:
29572
diff
changeset
|
1395 w = vo_old_width; |
75f54a9e4160
Move some variable initializations to the beginning of vo_x11_fullscreen().
diego
parents:
29572
diff
changeset
|
1396 h = vo_old_height; |
12582 | 1397 |
29514
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1398 if (WinID >= 0) { |
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1399 vo_fs = !vo_fs; |
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1400 return; |
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1401 } |
23a59bb3baf4
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
reimar
parents:
29332
diff
changeset
|
1402 if (vo_fs_flip) |
12582 | 1403 return; |
1404 | |
1405 if (vo_fs) | |
1406 { | |
33937 | 1407 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
|
1408 vo_fs = VO_FALSE; |
12582 | 1409 } else |
1410 { | |
1411 // win->fs | |
33937 | 1412 vo_x11_ewmh_fullscreen(vo_window, _NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH |
12582 | 1413 |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1414 vo_fs = VO_TRUE; |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1415 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
|
1416 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1417 vo_old_x = vo_dx; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1418 vo_old_y = vo_dy; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1419 vo_old_width = vo_dwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1420 vo_old_height = vo_dheight; |
23875
df05ff41590e
make sure update_xinerama_info is always called even when using the
reimar
parents:
23823
diff
changeset
|
1421 } |
18116 | 1422 update_xinerama_info(); |
1423 x = xinerama_x; | |
1424 y = xinerama_y; | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1425 w = vo_screenwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1426 h = vo_screenheight; |
12582 | 1427 } |
1428 { | |
1429 long dummy; | |
1430 | |
1431 XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy); | |
1432 if (!(vo_hint.flags & PWinGravity)) | |
1433 old_gravity = NorthWestGravity; | |
1434 else | |
1435 old_gravity = vo_hint.win_gravity; | |
1436 } | |
1437 if (vo_wm_type == 0 && !(vo_fsmode & 16)) | |
1438 { | |
1439 XUnmapWindow(mDisplay, vo_window); // required for MWM | |
1440 XWithdrawWindow(mDisplay, vo_window, mScreen); | |
1441 vo_fs_flip = 1; | |
1442 } | |
1443 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1444 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
|
1445 { |
27303
690ba711bda8
Make vo_x11_fullscreen not break vo_border (proper support still needs vo changes)
reimar
parents:
27029
diff
changeset
|
1446 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
|
1447 vo_x11_sizehint(x, y, w, h, 0); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1448 vo_x11_setlayer(mDisplay, vo_window, vo_fs); |
12582 | 1449 |
1450 | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1451 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1452 } |
21938 | 1453 /* 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
|
1454 if ((!(vo_fs)) & vo_ontop) |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1455 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
|
1456 |
12582 | 1457 XMapRaised(mDisplay, vo_window); |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1458 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
|
1459 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12582 | 1460 XRaiseWindow(mDisplay, vo_window); |
1461 XFlush(mDisplay); | |
1462 } | |
1463 | |
1464 void vo_x11_ontop(void) | |
1465 { | |
1466 vo_ontop = (!(vo_ontop)); | |
1467 | |
1468 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 1469 } |
1470 | |
27306
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1471 void vo_x11_border(void) |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1472 { |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1473 vo_border = !vo_border; |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1474 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
|
1475 } |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1476 |
9695 | 1477 /* |
1478 * XScreensaver stuff | |
1479 */ | |
1480 | |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1481 static int screensaver_off; |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1482 static unsigned int time_last; |
9695 | 1483 |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1484 void xscreensaver_heartbeat(void) |
9695 | 1485 { |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1486 unsigned int time = GetTimerMS(); |
9695 | 1487 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1488 if (mDisplay && screensaver_off && (time - time_last) > 30000) |
12582 | 1489 { |
1490 time_last = time; | |
9695 | 1491 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1492 XResetScreenSaver(mDisplay); |
9695 | 1493 } |
1494 } | |
1495 | |
25466 | 1496 static int xss_suspend(Bool suspend) |
1497 { | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1498 #ifndef CONFIG_XSS |
25466 | 1499 return 0; |
1500 #else | |
1501 int event, error, major, minor; | |
1502 if (XScreenSaverQueryExtension(mDisplay, &event, &error) != True || | |
1503 XScreenSaverQueryVersion(mDisplay, &major, &minor) != True) | |
1504 return 0; | |
27029
e8c49e69f46f
Add parentheses to expression to avoid the warning:
diego
parents:
26755
diff
changeset
|
1505 if (major < 1 || (major == 1 && minor < 1)) |
25466 | 1506 return 0; |
1507 XScreenSaverSuspend(mDisplay, suspend); | |
1508 return 1; | |
1509 #endif | |
1510 } | |
1511 | |
9695 | 1512 /* |
1513 * End of XScreensaver stuff | |
1514 */ | |
1515 | |
12582 | 1516 void saver_on(Display * mDisplay) |
1517 { | |
324 | 1518 |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1519 if (!screensaver_off) |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1520 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1521 screensaver_off = 0; |
25466 | 1522 if (xss_suspend(False)) |
1523 return; | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1524 #ifdef CONFIG_XDPMS |
324 | 1525 if (dpms_disabled) |
1526 { | |
25447 | 1527 int nothing; |
12582 | 1528 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1529 { | |
1530 if (!DPMSEnable(mDisplay)) | |
1531 { // restoring power saving settings | |
1532 mp_msg(MSGT_VO, MSGL_WARN, "DPMS not available?\n"); | |
1533 } else | |
1534 { | |
741 | 1535 // DPMS does not seem to be enabled unless we call DPMSInfo |
12582 | 1536 BOOL onoff; |
1537 CARD16 state; | |
1538 | |
1539 DPMSForceLevel(mDisplay, DPMSModeOn); | |
1540 DPMSInfo(mDisplay, &state, &onoff); | |
1541 if (onoff) | |
1542 { | |
13946 | 1543 mp_msg(MSGT_VO, MSGL_V, |
12582 | 1544 "Successfully enabled DPMS\n"); |
1545 } else | |
1546 { | |
1547 mp_msg(MSGT_VO, MSGL_WARN, "Could not enable DPMS\n"); | |
741 | 1548 } |
1549 } | |
12582 | 1550 } |
1551 dpms_disabled = 0; | |
324 | 1552 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1553 #endif |
324 | 1554 } |
1555 | |
12582 | 1556 void saver_off(Display * mDisplay) |
1557 { | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1558 int nothing; |
324 | 1559 |
33986
90a73d713bb2
Make the stop-xscreensaver option behave as described in the man page.
reimar
parents:
33966
diff
changeset
|
1560 if (!stop_xscreensaver || screensaver_off) |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1561 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1562 screensaver_off = 1; |
25466 | 1563 if (xss_suspend(True)) |
1564 return; | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1565 #ifdef CONFIG_XDPMS |
324 | 1566 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1567 { | |
12582 | 1568 BOOL onoff; |
1569 CARD16 state; | |
1570 | |
1571 DPMSInfo(mDisplay, &state, &onoff); | |
1572 if (onoff) | |
1573 { | |
1574 Status stat; | |
1575 | |
13946 | 1576 mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n"); |
12582 | 1577 dpms_disabled = 1; |
1578 stat = DPMSDisable(mDisplay); // monitor powersave off | |
1579 mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat); | |
1580 } | |
324 | 1581 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1582 #endif |
326 | 1583 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1584 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1585 static XErrorHandler old_handler = NULL; |
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1586 static int selectinput_err = 0; |
12582 | 1587 static int x11_selectinput_errorhandler(Display * display, |
1588 XErrorEvent * event) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1589 { |
12582 | 1590 if (event->error_code == BadAccess) |
1591 { | |
1592 selectinput_err = 1; | |
1593 mp_msg(MSGT_VO, MSGL_ERR, | |
1594 "X11 error: BadAccess during XSelectInput Call\n"); | |
1595 mp_msg(MSGT_VO, MSGL_ERR, | |
35933 | 1596 "X11 error: The 'ButtonPressMask' mask of specified window was probably already used by another application (see man XSelectInput)\n"); |
21938 | 1597 /* If you think MPlayer should shutdown with this error, |
1598 * comment out the following line */ | |
12582 | 1599 return 0; |
1600 } | |
1601 if (old_handler != NULL) | |
1602 old_handler(display, event); | |
1603 else | |
1604 x11_errorhandler(display, event); | |
1605 return 0; | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1606 } |
3990 | 1607 |
12582 | 1608 void vo_x11_selectinput_witherr(Display * display, Window w, |
1609 long event_mask) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1610 { |
12582 | 1611 XSync(display, False); |
1612 old_handler = XSetErrorHandler(x11_selectinput_errorhandler); | |
1613 selectinput_err = 0; | |
1614 if (vo_nomouse_input) | |
1615 { | |
1616 XSelectInput(display, w, | |
1617 event_mask & | |
1618 (~(ButtonPressMask | ButtonReleaseMask))); | |
1619 } else | |
1620 { | |
1621 XSelectInput(display, w, event_mask); | |
1622 } | |
1623 XSync(display, False); | |
1624 XSetErrorHandler(old_handler); | |
1625 if (selectinput_err) | |
1626 { | |
1627 mp_msg(MSGT_VO, MSGL_ERR, | |
1628 "X11 error: MPlayer discards mouse control (reconfiguring)\n"); | |
1629 XSelectInput(display, w, | |
1630 event_mask & | |
1631 (~ | |
1632 (ButtonPressMask | ButtonReleaseMask | | |
1633 PointerMotionMask))); | |
1634 } | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1635 } |
3990 | 1636 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1637 #ifdef CONFIG_XF86VM |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1638 void vo_vm_switch(void) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1639 { |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1640 int vm_event, vm_error; |
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1641 int vm_ver, vm_rev; |
12582 | 1642 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
|
1643 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
|
1644 int modeline_width, modeline_height; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1645 |
12582 | 1646 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) |
1647 { | |
1648 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
18508 | 1649 mp_msg(MSGT_VO, MSGL_V, "XF86VidMode extension v%i.%i\n", vm_ver, |
12582 | 1650 vm_rev); |
1651 have_vm = 1; | |
27887
47385b5c0613
Set modeline_width/height to sane values in vo_vm_switch even when
reimar
parents:
27885
diff
changeset
|
1652 } else { |
12582 | 1653 mp_msg(MSGT_VO, MSGL_WARN, |
18508 | 1654 "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
|
1655 } |
12582 | 1656 |
1657 if (have_vm) | |
1658 { | |
1659 if (vidmodes == NULL) | |
1660 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1661 &vidmodes); | |
1662 j = 0; | |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1663 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
|
1664 modeline_height = vidmodes[0]->vdisplay; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1665 |
12582 | 1666 for (i = 1; i < modecount; i++) |
1667 if ((vidmodes[i]->hdisplay >= X) | |
1668 && (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
|
1669 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
|
1670 && (vidmodes[i]->vdisplay <= modeline_height)) |
12582 | 1671 { |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1672 modeline_width = vidmodes[i]->hdisplay; |
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1673 modeline_height = vidmodes[i]->vdisplay; |
12582 | 1674 j = i; |
1675 } | |
1676 | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16301
diff
changeset
|
1677 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
|
1678 modeline_width, modeline_height, X, Y); |
12582 | 1679 XF86VidModeLockModeSwitch(mDisplay, mScreen, 0); |
1680 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1681 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
|
1682 |
08a5ccceb21a
Set modified window position and monitor aspect in vo_vm_switch instead of in
reimar
parents:
27887
diff
changeset
|
1683 // 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
|
1684 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
|
1685 Y = (vo_screenheight - modeline_height) / 2; |
12582 | 1686 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
|
1687 vo_dx = X; |
08a5ccceb21a
Set modified window position and monitor aspect in vo_vm_switch instead of in
reimar
parents:
27887
diff
changeset
|
1688 vo_dy = Y; |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1689 vo_dwidth = modeline_width; |
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1690 vo_dheight = modeline_height; |
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1691 aspect_save_screenres(modeline_width, modeline_height); |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1692 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1693 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1694 |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1695 void vo_vm_close(void) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1696 { |
12582 | 1697 if (vidmodes != NULL) |
1698 { | |
35190
48943c3398ff
Since the modecount variable is only ever initialized when the videmodes
reimar
parents:
34639
diff
changeset
|
1699 int i; |
5019 | 1700 |
12582 | 1701 free(vidmodes); |
1702 vidmodes = NULL; | |
1703 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1704 &vidmodes); | |
1705 for (i = 0; i < modecount; i++) | |
1706 if ((vidmodes[i]->hdisplay == vo_screenwidth) | |
1707 && (vidmodes[i]->vdisplay == vo_screenheight)) | |
1708 { | |
1709 mp_msg(MSGT_VO, MSGL_INFO, | |
1710 "Returning to original mode %dx%d\n", | |
1711 vo_screenwidth, vo_screenheight); | |
1712 break; | |
1713 } | |
5019 | 1714 |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1715 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
|
1716 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[i]); |
12582 | 1717 free(vidmodes); |
1718 vidmodes = NULL; | |
35190
48943c3398ff
Since the modecount variable is only ever initialized when the videmodes
reimar
parents:
34639
diff
changeset
|
1719 modecount = 0; |
12582 | 1720 } |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1721 } |
3990 | 1722 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1723 |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1724 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1725 /* |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1726 * 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
|
1727 * 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
|
1728 * 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
|
1729 * >= 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
|
1730 */ |
12582 | 1731 int vo_find_depth_from_visuals(Display * dpy, int screen, |
1732 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
|
1733 { |
12582 | 1734 XVisualInfo visual_tmpl; |
1735 XVisualInfo *visuals; | |
1736 int nvisuals, i; | |
1737 int bestvisual = -1; | |
1738 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
|
1739 |
12582 | 1740 visual_tmpl.screen = screen; |
1741 visual_tmpl.class = TrueColor; | |
1742 visuals = XGetVisualInfo(dpy, | |
1743 VisualScreenMask | VisualClassMask, | |
1744 &visual_tmpl, &nvisuals); | |
1745 if (visuals != NULL) | |
1746 { | |
1747 for (i = 0; i < nvisuals; i++) | |
1748 { | |
1749 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1750 "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n", |
12582 | 1751 visuals[i].visualid, visuals[i].depth, |
1752 visuals[i].red_mask, visuals[i].green_mask, | |
1753 visuals[i].blue_mask); | |
1754 /* | |
21938 | 1755 * Save the visual index and its depth, if this is the first |
35933 | 1756 * truecolor visual, or a visual that is 'preferred' over the |
21938 | 1757 * previous 'best' visual. |
12582 | 1758 */ |
1759 if (bestvisual_depth == -1 | |
1760 || (visuals[i].depth >= 15 | |
1761 && (visuals[i].depth < bestvisual_depth | |
1762 || bestvisual_depth < 15))) | |
1763 { | |
1764 bestvisual = i; | |
1765 bestvisual_depth = visuals[i].depth; | |
1766 } | |
1767 } | |
1768 | |
1769 if (bestvisual != -1 && visual_return != NULL) | |
1770 *visual_return = visuals[bestvisual].visual; | |
1771 | |
1772 XFree(visuals); | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1773 } |
12582 | 1774 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
|
1775 } |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1776 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1777 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1778 static Colormap cmap = None; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1779 static XColor cols[256]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1780 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
|
1781 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1782 |
12582 | 1783 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
|
1784 { |
12582 | 1785 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
|
1786 |
12582 | 1787 if (vinfo->class != DirectColor) |
1788 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, | |
1789 AllocNone); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1790 |
12582 | 1791 /* can this function get called twice or more? */ |
1792 if (cmap) | |
1793 return cmap; | |
1794 cm_size = vinfo->colormap_size; | |
1795 red_mask = vinfo->red_mask; | |
1796 green_mask = vinfo->green_mask; | |
1797 blue_mask = vinfo->blue_mask; | |
1798 ru = (red_mask & (red_mask - 1)) ^ red_mask; | |
1799 gu = (green_mask & (green_mask - 1)) ^ green_mask; | |
1800 bu = (blue_mask & (blue_mask - 1)) ^ blue_mask; | |
1801 rvu = 65536ull * ru / (red_mask + ru); | |
1802 gvu = 65536ull * gu / (green_mask + gu); | |
1803 bvu = 65536ull * bu / (blue_mask + bu); | |
1804 r = g = b = 0; | |
1805 rv = gv = bv = 0; | |
1806 m = DoRed | DoGreen | DoBlue; | |
1807 for (k = 0; k < cm_size; k++) | |
1808 { | |
1809 int t; | |
1810 | |
1811 cols[k].pixel = r | g | b; | |
1812 cols[k].red = rv; | |
1813 cols[k].green = gv; | |
1814 cols[k].blue = bv; | |
1815 cols[k].flags = m; | |
1816 t = (r + ru) & red_mask; | |
1817 if (t < r) | |
1818 m &= ~DoRed; | |
1819 r = t; | |
1820 t = (g + gu) & green_mask; | |
1821 if (t < g) | |
1822 m &= ~DoGreen; | |
1823 g = t; | |
1824 t = (b + bu) & blue_mask; | |
1825 if (t < b) | |
1826 m &= ~DoBlue; | |
1827 b = t; | |
1828 rv += rvu; | |
1829 gv += gvu; | |
1830 bv += bvu; | |
1831 } | |
1832 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll); | |
1833 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1834 return cmap; | |
7964
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 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1837 /* |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1838 * 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
|
1839 * 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
|
1840 * 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
|
1841 * 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
|
1842 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1843 /* 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
|
1844 static int vo_gamma = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1845 static int vo_brightness = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1846 static int vo_contrast = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1847 |
25674
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1848 static int transform_color(float val, |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1849 float brightness, float contrast, float gamma) { |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1850 float s = pow(val, gamma); |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1851 s = (s - 0.5) * contrast + 0.5; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1852 s += brightness; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1853 if (s < 0) |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1854 s = 0; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1855 if (s > 1) |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1856 s = 1; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1857 return (unsigned short) (s * 65535); |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1858 } |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1859 |
33313
169a40da4c53
Add "const" to equalizer name argument to avoid compiler warnings.
reimar
parents:
33300
diff
changeset
|
1860 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
|
1861 { |
12582 | 1862 float gamma, brightness, contrast; |
1863 float rf, gf, bf; | |
1864 int k; | |
1865 | |
1866 /* | |
1867 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case | |
1868 * of TrueColor-ed window but be careful: | |
21938 | 1869 * Unlike the colormaps, which are private for the X client |
12582 | 1870 * who created them and thus automatically destroyed on client |
1871 * disconnect, this gamma ramp is a system-wide (X-server-wide) | |
21938 | 1872 * setting and _must_ be restored before the process exits. |
1873 * Unforunately when the process crashes (or gets killed | |
12582 | 1874 * for some reason) it is impossible to restore the setting, |
1875 * and such behaviour could be rather annoying for the users. | |
1876 */ | |
1877 if (cmap == None) | |
1878 return VO_NOTAVAIL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1879 |
12582 | 1880 if (!strcasecmp(name, "brightness")) |
1881 vo_brightness = value; | |
1882 else if (!strcasecmp(name, "contrast")) | |
1883 vo_contrast = value; | |
1884 else if (!strcasecmp(name, "gamma")) | |
1885 vo_gamma = value; | |
1886 else | |
1887 return VO_NOTIMPL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1888 |
12582 | 1889 brightness = 0.01 * vo_brightness; |
1890 contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4); | |
1891 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
|
1892 |
12582 | 1893 rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask; |
1894 gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) / | |
1895 green_mask; | |
1896 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
|
1897 |
12582 | 1898 /* now recalculate the colormap using the newly set value */ |
1899 for (k = 0; k < cm_size; k++) | |
1900 { | |
25674
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1901 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
|
1902 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
|
1903 cols[k].blue = transform_color(bf * k, brightness, contrast, gamma); |
12582 | 1904 } |
1905 | |
1906 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1907 XFlush(mDisplay); | |
1908 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1909 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1910 |
33313
169a40da4c53
Add "const" to equalizer name argument to avoid compiler warnings.
reimar
parents:
33300
diff
changeset
|
1911 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
|
1912 { |
12582 | 1913 if (cmap == None) |
1914 return VO_NOTAVAIL; | |
1915 if (!strcasecmp(name, "brightness")) | |
1916 *value = vo_brightness; | |
1917 else if (!strcasecmp(name, "contrast")) | |
1918 *value = vo_contrast; | |
1919 else if (!strcasecmp(name, "gamma")) | |
1920 *value = vo_gamma; | |
1921 else | |
1922 return VO_NOTIMPL; | |
1923 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1924 } |
12582 | 1925 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1926 #ifdef CONFIG_XV |
33300
c7ebb0b711a6
Make vo_xv_set/get_eq() functions expect "const char *" for attribute name.
iive
parents:
32368
diff
changeset
|
1927 int vo_xv_set_eq(uint32_t xv_port, const char *name, int value) |
10359 | 1928 { |
1929 XvAttribute *attributes; | |
12582 | 1930 int i, howmany, xv_atom; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1931 |
10359 | 1932 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
|
1933 |
10359 | 1934 /* get available attributes */ |
1935 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
1936 for (i = 0; i < howmany && attributes; i++) | |
12582 | 1937 if (attributes[i].flags & XvSettable) |
1938 { | |
1939 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 1940 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
1941 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 1942 if (xv_atom != None) |
1943 { | |
1944 int hue = 0, port_value, port_min, port_max; | |
10359 | 1945 |
12582 | 1946 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
1947 (!strcasecmp(name, "brightness"))) | |
1948 port_value = value; | |
1949 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
1950 (!strcasecmp(name, "contrast"))) | |
1951 port_value = value; | |
1952 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
1953 (!strcasecmp(name, "saturation"))) | |
1954 port_value = value; | |
1955 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
1956 (!strcasecmp(name, "hue"))) | |
1957 { | |
1958 port_value = value; | |
1959 hue = 1; | |
1960 } else | |
10359 | 1961 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 1962 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
1963 (!strcasecmp(name, "red_intensity"))) | |
1964 port_value = value; | |
1965 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
1966 && (!strcasecmp(name, "green_intensity"))) | |
1967 port_value = value; | |
1968 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
1969 && (!strcasecmp(name, "blue_intensity"))) | |
1970 port_value = value; | |
1971 else | |
1972 continue; | |
1973 | |
1974 port_min = attributes[i].min_value; | |
1975 port_max = attributes[i].max_value; | |
10359 | 1976 |
12582 | 1977 /* nvidia hue workaround */ |
1978 if (hue && port_min == 0 && port_max == 360) | |
1979 { | |
1980 port_value = | |
1981 (port_value >= | |
1982 0) ? (port_value - 100) : (port_value + 100); | |
10359 | 1983 } |
12582 | 1984 // -100 -> min |
1985 // 0 -> (max+min)/2 | |
1986 // +100 -> max | |
1987 port_value = | |
1988 (port_value + 100) * (port_max - port_min) / 200 + | |
1989 port_min; | |
1990 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value); | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
1991 return VO_TRUE; |
12582 | 1992 } |
1993 } | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
1994 return VO_FALSE; |
10359 | 1995 } |
1996 | |
33300
c7ebb0b711a6
Make vo_xv_set/get_eq() functions expect "const char *" for attribute name.
iive
parents:
32368
diff
changeset
|
1997 int vo_xv_get_eq(uint32_t xv_port, const char *name, int *value) |
10359 | 1998 { |
12582 | 1999 |
10359 | 2000 XvAttribute *attributes; |
12582 | 2001 int i, howmany, xv_atom; |
10359 | 2002 |
2003 /* get available attributes */ | |
2004 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2005 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2006 if (attributes[i].flags & XvGettable) |
2007 { | |
2008 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2009 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2010 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2011 if (xv_atom != None) |
2012 { | |
2013 int val, port_value = 0, port_min, port_max; | |
10359 | 2014 |
12582 | 2015 XvGetPortAttribute(mDisplay, xv_port, xv_atom, |
2016 &port_value); | |
2017 | |
2018 port_min = attributes[i].min_value; | |
2019 port_max = attributes[i].max_value; | |
2020 val = | |
2021 (port_value - port_min) * 200 / (port_max - port_min) - | |
2022 100; | |
10359 | 2023 |
12582 | 2024 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2025 (!strcasecmp(name, "brightness"))) | |
2026 *value = val; | |
2027 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2028 (!strcasecmp(name, "contrast"))) | |
2029 *value = val; | |
2030 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2031 (!strcasecmp(name, "saturation"))) | |
2032 *value = val; | |
2033 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2034 (!strcasecmp(name, "hue"))) | |
2035 { | |
2036 /* nasty nvidia detect */ | |
2037 if (port_min == 0 && port_max == 360) | |
2038 *value = (val >= 0) ? (val - 100) : (val + 100); | |
2039 else | |
2040 *value = val; | |
2041 } else | |
10359 | 2042 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2043 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2044 (!strcasecmp(name, "red_intensity"))) | |
2045 *value = val; | |
2046 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2047 && (!strcasecmp(name, "green_intensity"))) | |
2048 *value = val; | |
2049 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2050 && (!strcasecmp(name, "blue_intensity"))) | |
2051 *value = val; | |
2052 else | |
2053 continue; | |
10359 | 2054 |
12582 | 2055 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", |
2056 name, *value); | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
2057 return VO_TRUE; |
12582 | 2058 } |
2059 } | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
2060 return VO_FALSE; |
10359 | 2061 } |
2062 | |
14742 | 2063 /** \brief contains flags changing the execution of the colorkeying code */ |
2064 xv_ck_info_t xv_ck_info = { CK_METHOD_MANUALFILL, CK_SRC_CUR }; | |
2065 unsigned long xv_colorkey; ///< The color used for manual colorkeying. | |
2066 unsigned int xv_port; ///< The selected Xv port. | |
2067 | |
2068 /** | |
2069 * \brief Interns the requested atom if it is available. | |
2070 * | |
2071 * \param atom_name String containing the name of the requested atom. | |
2072 * | |
2073 * \return Returns the atom if available, else None is returned. | |
2074 * | |
2075 */ | |
2076 static Atom xv_intern_atom_if_exists( char const * atom_name ) | |
2077 { | |
2078 XvAttribute * attributes; | |
2079 int attrib_count,i; | |
2080 Atom xv_atom = None; | |
2081 | |
2082 attributes = XvQueryPortAttributes( mDisplay, xv_port, &attrib_count ); | |
2083 if( attributes!=NULL ) | |
2084 { | |
2085 for ( i = 0; i < attrib_count; ++i ) | |
2086 { | |
2087 if ( strcmp(attributes[i].name, atom_name ) == 0 ) | |
2088 { | |
2089 xv_atom = XInternAtom( mDisplay, atom_name, False ); | |
2090 break; // found what we want, break out | |
2091 } | |
2092 } | |
2093 XFree( attributes ); | |
2094 } | |
2095 | |
2096 return xv_atom; | |
2097 } | |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2098 |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2099 /** |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2100 * \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
|
2101 * \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
|
2102 */ |
22886 | 2103 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
|
2104 { |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2105 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
|
2106 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
|
2107 return -1; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2108 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
|
2109 } |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2110 |
14742 | 2111 /** |
16958 | 2112 * \brief Get maximum supported source image dimensions. |
2113 * | |
2114 * This function does not set the variables pointed to by | |
21938 | 2115 * width and height if the information could not be retrieved, |
2116 * so the caller is reponsible for properly initializing them. | |
16958 | 2117 * |
2118 * \param width [out] The maximum width gets stored here. | |
2119 * \param height [out] The maximum height gets stored here. | |
2120 * | |
2121 */ | |
2122 void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ) | |
2123 { | |
2124 XvEncodingInfo * encodings; | |
2125 //unsigned long num_encodings, idx; to int or too long?! | |
2126 unsigned int num_encodings, idx; | |
2127 | |
2128 XvQueryEncodings( mDisplay, xv_port, &num_encodings, &encodings); | |
2129 | |
2130 if ( encodings ) | |
2131 { | |
2132 for ( idx = 0; idx < num_encodings; ++idx ) | |
2133 { | |
2134 if ( strcmp( encodings[idx].name, "XV_IMAGE" ) == 0 ) | |
2135 { | |
2136 *width = encodings[idx].width; | |
2137 *height = encodings[idx].height; | |
2138 break; | |
2139 } | |
2140 } | |
2141 } | |
2142 | |
2143 mp_msg( MSGT_VO, MSGL_V, | |
2144 "[xv common] Maximum source image dimensions: %ux%u\n", | |
2145 *width, *height ); | |
2146 | |
2147 XvFreeEncodingInfo( encodings ); | |
2148 } | |
2149 | |
2150 /** | |
14742 | 2151 * \brief Print information about the colorkey method and source. |
2152 * | |
2153 * \param ck_handling Integer value containing the information about | |
2154 * colorkey handling (see x11_common.h). | |
2155 * | |
2156 * Outputs the content of |ck_handling| as a readable message. | |
2157 * | |
2158 */ | |
30556
358ac046eccc
libvo: Mark functions not used outside of their files as static.
diego
parents:
30516
diff
changeset
|
2159 static void vo_xv_print_ck_info(void) |
14742 | 2160 { |
2161 mp_msg( MSGT_VO, MSGL_V, "[xv common] " ); | |
2162 | |
2163 switch ( xv_ck_info.method ) | |
2164 { | |
2165 case CK_METHOD_NONE: | |
2166 mp_msg( MSGT_VO, MSGL_V, "Drawing no colorkey.\n" ); return; | |
2167 case CK_METHOD_AUTOPAINT: | |
2168 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn by Xv." ); break; | |
2169 case CK_METHOD_MANUALFILL: | |
2170 mp_msg( MSGT_VO, MSGL_V, "Drawing colorkey manually." ); break; | |
2171 case CK_METHOD_BACKGROUND: | |
2172 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn as window background." ); break; | |
2173 } | |
2174 | |
2175 mp_msg( MSGT_VO, MSGL_V, "\n[xv common] " ); | |
2176 | |
2177 switch ( xv_ck_info.source ) | |
2178 { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2179 case CK_SRC_CUR: |
17366 | 2180 mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n", |
14742 | 2181 xv_colorkey ); |
2182 break; | |
2183 case CK_SRC_USE: | |
2184 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2185 { | |
2186 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2187 "Ignoring colorkey from MPlayer (0x%06lx).\n", |
14742 | 2188 xv_colorkey ); |
2189 } | |
2190 else | |
2191 { | |
2192 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2193 "Using colorkey from MPlayer (0x%06lx)." |
14742 | 2194 " Use -colorkey to change.\n", |
2195 xv_colorkey ); | |
2196 } | |
2197 break; | |
2198 case CK_SRC_SET: | |
2199 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2200 "Setting and using colorkey from MPlayer (0x%06lx)." |
14742 | 2201 " Use -colorkey to change.\n", |
2202 xv_colorkey ); | |
2203 break; | |
2204 } | |
2205 } | |
2206 /** | |
2207 * \brief Init colorkey depending on the settings in xv_ck_info. | |
2208 * | |
2209 * \return Returns 0 on failure and 1 on success. | |
2210 * | |
2211 * Sets the colorkey variable according to the CK_SRC_* and CK_METHOD_* | |
2212 * flags in xv_ck_info. | |
2213 * | |
2214 * Possiblilities: | |
2215 * * Methods | |
2216 * - manual colorkey drawing ( CK_METHOD_MANUALFILL ) | |
2217 * - set colorkey as window background ( CK_METHOD_BACKGROUND ) | |
2218 * - let Xv paint the colorkey ( CK_METHOD_AUTOPAINT ) | |
2219 * * Sources | |
2220 * - use currently set colorkey ( CK_SRC_CUR ) | |
2221 * - use colorkey in vo_colorkey ( CK_SRC_USE ) | |
2222 * - use and set colorkey in vo_colorkey ( CK_SRC_SET ) | |
2223 * | |
2224 * NOTE: If vo_colorkey has bits set after the first 3 low order bytes | |
2225 * we don't draw anything as this means it was forced to off. | |
2226 */ | |
22886 | 2227 int vo_xv_init_colorkey(void) |
14742 | 2228 { |
2229 Atom xv_atom; | |
2230 int rez; | |
2231 | |
2232 /* check if colorkeying is needed */ | |
2233 xv_atom = xv_intern_atom_if_exists( "XV_COLORKEY" ); | |
2234 | |
2235 /* if we have to deal with colorkeying ... */ | |
2236 if( xv_atom != None && !(vo_colorkey & 0xFF000000) ) | |
2237 { | |
2238 /* check if we should use the colorkey specified in vo_colorkey */ | |
2239 if ( xv_ck_info.source != CK_SRC_CUR ) | |
2240 { | |
2241 xv_colorkey = vo_colorkey; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2242 |
14742 | 2243 /* check if we have to set the colorkey too */ |
2244 if ( xv_ck_info.source == CK_SRC_SET ) | |
2245 { | |
2246 xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2247 |
14742 | 2248 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, vo_colorkey ); |
2249 if ( rez != Success ) | |
2250 { | |
2251 mp_msg( MSGT_VO, MSGL_FATAL, | |
2252 "[xv common] Couldn't set colorkey!\n" ); | |
2253 return 0; // error setting colorkey | |
2254 } | |
2255 } | |
2256 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2257 else |
14742 | 2258 { |
2259 int colorkey_ret; | |
2260 | |
2261 rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey_ret); | |
2262 if ( rez == Success ) | |
2263 { | |
2264 xv_colorkey = colorkey_ret; | |
2265 } | |
2266 else | |
2267 { | |
2268 mp_msg( MSGT_VO, MSGL_FATAL, | |
2269 "[xv common] Couldn't get colorkey!" | |
2270 "Maybe the selected Xv port has no overlay.\n" ); | |
2271 return 0; // error getting colorkey | |
2272 } | |
2273 } | |
2274 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2275 xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" ); |
15186 | 2276 |
14742 | 2277 /* should we draw the colorkey ourselves or activate autopainting? */ |
2278 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2279 { | |
2280 rez = !Success; // reset rez to something different than Success | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2281 |
14742 | 2282 if ( xv_atom != None ) // autopaint is supported |
2283 { | |
2284 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, 1 ); | |
2285 } | |
2286 | |
2287 if ( rez != Success ) | |
2288 { | |
2289 // fallback to manual colorkey drawing | |
2290 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2291 } | |
2292 } | |
15186 | 2293 else // disable colorkey autopainting if supported |
2294 { | |
2295 if ( xv_atom != None ) // we have autopaint attribute | |
2296 { | |
2297 XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 ); | |
2298 } | |
2299 } | |
14742 | 2300 } |
2301 else // do no colorkey drawing at all | |
2302 { | |
2303 xv_ck_info.method = CK_METHOD_NONE; | |
2304 } /* end: should we draw colorkey */ | |
2305 | |
21938 | 2306 /* output information about the current colorkey settings */ |
14742 | 2307 vo_xv_print_ck_info(); |
2308 | |
2309 return 1; // success | |
2310 } | |
2311 | |
2312 /** | |
2313 * \brief Draw the colorkey on the video window. | |
2314 * | |
2315 * Draws the colorkey depending on the set method ( colorkey_handling ). | |
2316 * | |
21938 | 2317 * Also draws the black bars ( when the video doesn't fit the display in |
2318 * fullscreen ) separately, so they don't overlap with the video area. | |
2319 * It doesn't call XFlush. | |
14742 | 2320 * |
2321 */ | |
24890 | 2322 void vo_xv_draw_colorkey( int32_t x, int32_t y, |
15100 | 2323 int32_t w, int32_t h ) |
14742 | 2324 { |
15100 | 2325 if( xv_ck_info.method == CK_METHOD_MANUALFILL || |
2326 xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow() | |
14742 | 2327 { |
2328 XSetForeground( mDisplay, vo_gc, xv_colorkey ); | |
2329 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2330 x, y, | |
2331 w, h ); | |
2332 } | |
2333 | |
2334 /* draw black bars if needed */ | |
15100 | 2335 /* TODO! move this to vo_x11_clearwindow_part() */ |
14742 | 2336 if ( vo_fs ) |
2337 { | |
2338 XSetForeground( mDisplay, vo_gc, 0 ); | |
21938 | 2339 /* making non-overlap fills, requires 8 checks instead of 4 */ |
14742 | 2340 if ( y > 0 ) |
2341 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2342 0, 0, | |
2343 vo_screenwidth, y); | |
2344 if (x > 0) | |
2345 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2346 0, 0, |
2347 x, vo_screenheight); | |
14742 | 2348 if (x + w < vo_screenwidth) |
2349 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2350 x + w, 0, |
2351 vo_screenwidth, vo_screenheight); | |
14742 | 2352 if (y + h < vo_screenheight) |
2353 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2354 0, y + h, | |
15100 | 2355 vo_screenwidth, vo_screenheight); |
14742 | 2356 } |
2357 } | |
2358 | |
21938 | 2359 /** \brief Tests if a valid argument for the ck suboption was given. */ |
14742 | 2360 int xv_test_ck( void * arg ) |
2361 { | |
2362 strarg_t * strarg = (strarg_t *)arg; | |
2363 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2364 if ( strargcmp( strarg, "use" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2365 strargcmp( strarg, "set" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2366 strargcmp( strarg, "cur" ) == 0 ) |
14742 | 2367 { |
2368 return 1; | |
2369 } | |
2370 | |
2371 return 0; | |
2372 } | |
21938 | 2373 /** \brief Tests if a valid arguments for the ck-method suboption was given. */ |
14742 | 2374 int xv_test_ckm( void * arg ) |
2375 { | |
2376 strarg_t * strarg = (strarg_t *)arg; | |
2377 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2378 if ( strargcmp( strarg, "bg" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2379 strargcmp( strarg, "man" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2380 strargcmp( strarg, "auto" ) == 0 ) |
14742 | 2381 { |
2382 return 1; | |
2383 } | |
2384 | |
2385 return 0; | |
2386 } | |
2387 | |
2388 /** | |
2389 * \brief Modify the colorkey_handling var according to str | |
2390 * | |
2391 * Checks if a valid pointer ( not NULL ) to the string | |
2392 * was given. And in that case modifies the colorkey_handling | |
2393 * var to reflect the requested behaviour. | |
2394 * If nothing happens the content of colorkey_handling stays | |
2395 * the same. | |
2396 * | |
2397 * \param str Pointer to the string or NULL | |
2398 * | |
2399 */ | |
2400 void xv_setup_colorkeyhandling( char const * ck_method_str, | |
2401 char const * ck_str ) | |
2402 { | |
2403 /* check if a valid pointer to the string was passed */ | |
2404 if ( ck_str ) | |
2405 { | |
2406 if ( strncmp( ck_str, "use", 3 ) == 0 ) | |
2407 { | |
2408 xv_ck_info.source = CK_SRC_USE; | |
2409 } | |
2410 else if ( strncmp( ck_str, "set", 3 ) == 0 ) | |
2411 { | |
2412 xv_ck_info.source = CK_SRC_SET; | |
2413 } | |
2414 } | |
2415 /* check if a valid pointer to the string was passed */ | |
2416 if ( ck_method_str ) | |
2417 { | |
2418 if ( strncmp( ck_method_str, "bg", 2 ) == 0 ) | |
2419 { | |
2420 xv_ck_info.method = CK_METHOD_BACKGROUND; | |
2421 } | |
2422 else if ( strncmp( ck_method_str, "man", 3 ) == 0 ) | |
2423 { | |
2424 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2425 } |
14742 | 2426 else if ( strncmp( ck_method_str, "auto", 4 ) == 0 ) |
2427 { | |
2428 xv_ck_info.method = CK_METHOD_AUTOPAINT; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28771
diff
changeset
|
2429 } |
14742 | 2430 } |
2431 } | |
2432 | |
10359 | 2433 #endif |