annotate libvo/x11_common.c @ 15978:c8dc500e078e

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