annotate libvo/x11_common.c @ 29851:eaa7bfc52c2c

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