annotate libvo/x11_common.c @ 34025:e7f393cb9d0f

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