annotate libvo/x11_common.c @ 25418:0cc73d213160

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