annotate libvo/x11_common.c @ 14001:7032d122c733

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