annotate libvo/x11_common.c @ 25893:638493dc056e

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