annotate libvo/x11_common.c @ 15572:5d738acd664c

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