annotate libvo/x11_common.c @ 9100:971ed787054f

fixed ./configure --cc="ccache gcc"
author arpi
date Sun, 26 Jan 2003 15:42:11 +0000
parents f84a5237f914
children 420e2b2f8e5a
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>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
16
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
17 #include "video_out.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
18
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
19 #include <X11/Xmd.h>
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
20 #include <X11/Xlib.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
21 #include <X11/Xutil.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
22 #include <X11/Xatom.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
23
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
24 #ifdef HAVE_XDPMS
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
25 #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
26 #endif
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
27
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
28 #ifdef HAVE_XINERAMA
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
29 #include <X11/extensions/Xinerama.h>
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
30 #endif
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
31
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
32 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
33 #include <X11/extensions/xf86vmode.h>
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
34 #endif
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
35
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
36 #include "../input/input.h"
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
37 #include "../input/mouse.h"
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
38
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
39 #ifdef HAVE_NEW_GUI
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
40 #include "../Gui/interface.h"
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
41 #include "../mplayer.h"
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
42 #endif
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
43
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
44 #define WIN_LAYER_ONBOTTOM 2
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
45 #define WIN_LAYER_NORMAL 4
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
46 #define WIN_LAYER_ONTOP 6
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
47 #define WIN_LAYER_ABOVE_DOCK 10
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
48
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
49 int ice_layer=WIN_LAYER_ABOVE_DOCK;
8866
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
50 int orig_layer=WIN_LAYER_NORMAL;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
51
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
52 int stop_xscreensaver=0;
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
53
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
54 static int dpms_disabled=0;
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
55 static int timeout_save=0;
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
56 static int xscreensaver_was_running=0;
8354
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
57 static int kdescreensaver_was_running=0;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
58
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
59 char* mDisplayName=NULL;
6111
582960ab7cc7 Workaround the bug in x11 vo's (if it's one) wich let a window in the way
albeu
parents: 6095
diff changeset
60 Display* mDisplay=NULL;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
61 Window mRootWin;
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
62 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
63 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
64
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3490
diff changeset
65 /* output window id */
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3490
diff changeset
66 int WinID=-1;
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
67 int vo_mouse_autohide = 0;
6089
39c2bfe5c267 small fixes
pontscho
parents: 6077
diff changeset
68 int vo_wm_type = -1;
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
69
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
70 /* 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
71 int metacity_hack = 0;
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
72
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
73 int net_wm_support = 0;
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
74
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
75 Atom XA_NET_SUPPORTED;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
76 Atom XA_NET_WM_STATE;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
77 Atom XA_NET_WM_STATE_FULLSCREEN;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
78 Atom XA_NET_WM_STATE_ABOVE;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
79 Atom XA_NET_WM_STATE_STAYS_ON_TOP;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
80 Atom XA_NET_WM_PID;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
81 Atom XA_WIN_PROTOCOLS;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
82 Atom XA_WIN_LAYER;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
83 Atom XA_WIN_HINTS;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
84 Atom XA_BLACKBOX_PID;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
85
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
86 #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
87
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
88 static int vo_old_x = 0;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
89 static int vo_old_y = 0;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
90 static int vo_old_width = 0;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
91 static int vo_old_height = 0;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
92
8692
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
93 int vo_x11_keepaspect = 1;
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
94
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
95 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
96 int xinerama_screen = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
97 int xinerama_x = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
98 int xinerama_y = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
99 #endif
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
100 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
101 XF86VidModeModeInfo **vidmodes=NULL;
4977
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
102 XF86VidModeModeLine modeline;
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
103 #endif
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
104
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
105 void vo_hidecursor ( Display *disp , Window win )
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
106 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
107 Cursor no_ptr;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
108 Pixmap bm_no;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
109 XColor black,dummy;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
110 Colormap colormap;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
111 static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 };
3954
arpi
parents: 3951
diff changeset
112
arpi
parents: 3951
diff changeset
113 if(WinID==0) return; // do not hide, if we're playing at rootwin
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
114
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
115 colormap = DefaultColormap(disp,DefaultScreen(disp));
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
116 XAllocNamedColor(disp,colormap,"black",&black,&dummy);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
117 bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8,8);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
118 no_ptr=XCreatePixmapCursor(disp, bm_no, bm_no,&black, &black,0, 0);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
119 XDefineCursor(disp,win,no_ptr);
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
120 XFreeCursor( disp,no_ptr );
8716
ef36186ca7e0 fix bitmap leak pointed out by Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
attila
parents: 8694
diff changeset
121 if (bm_no != None)
ef36186ca7e0 fix bitmap leak pointed out by Pierre-Paul Lavoie <ppl@nbnet.nb.ca>
attila
parents: 8694
diff changeset
122 XFreePixmap(disp, bm_no);
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
123 }
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
124
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
125 void vo_showcursor( Display *disp, Window win )
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
126 {
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
127 if ( WinID==0 ) return;
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
128 XDefineCursor( disp,win,0 );
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
129 }
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
130
6077
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
131 static int x11_errorhandler(Display *display, XErrorEvent *event)
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
132 {
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
133 #define MSGLEN 60
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
134 char msg[MSGLEN];
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
135
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
136 XGetErrorText(display, event->error_code, (char *)&msg, MSGLEN);
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
137
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
138 mp_msg(MSGT_VO,MSGL_ERR,"X11 error: %s\n", msg);
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
139
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
140 mp_msg(MSGT_VO,MSGL_V,"Type: %x, display: %x, resourceid: %x, serial: %x\n",
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
141 event->type, event->display, event->resourceid, event->serial);
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
142 mp_msg(MSGT_VO,MSGL_V,"Error code: %x, request code: %x, minor code: %x\n",
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
143 event->error_code, event->request_code, event->minor_code);
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
144
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
145 abort();
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
146 //exit_player("X11 error");
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
147 #undef MSGLEN
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
148 }
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
149
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
150 int net_wm_support_state_test( Atom atom )
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
151 {
8783
9fefdd9064b5 Added missing spaces around found atom name.
filon
parents: 8753
diff changeset
152 #define NET_WM_STATE_TEST(x) { if (atom == XA_NET_WM_STATE_##x) { mp_dbg( MSGT_VO,MSGL_STATUS, "[x11] Detected wm supports " #x " state.\n" ); return SUPPORT_##x; } }
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
153
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
154 NET_WM_STATE_TEST(FULLSCREEN);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
155 NET_WM_STATE_TEST(ABOVE);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
156 NET_WM_STATE_TEST(STAYS_ON_TOP);
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
157 return SUPPORT_NONE;
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
158 }
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
159
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
160 int x11_get_property(Atom type, Atom **args, unsigned long *nitems)
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
161 {
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
162 int format;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
163 unsigned long bytesafter;
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
164
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
165 return (Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
166 False,AnyPropertyType,&type,&format,nitems,&bytesafter,
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
167 (unsigned char **) args ) && *nitems > 0 );
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
168 }
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
169
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
170 int vo_wm_detect( void )
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
171 {
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
172 int i;
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
173 int wm = vo_wm_Unknown;
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
174 unsigned long nitems;
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
175 Atom * args = NULL;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
176
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
177 if ( WinID >= 0 ) return vo_wm_Unknown;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
178
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
179 // -- supports layers
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
180 if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems))
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
181 {
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
182 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm supports layers.\n" );
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
183 for (i = 0; i < nitems; i++)
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
184 {
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
185 if ( args[i] == XA_WIN_LAYER) {
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
186 wm = vo_wm_Layered;
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
187 metacity_hack |= 1;
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
188 }
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
189 if ( args[i] == XA_WIN_HINTS)
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
190 // metacity is the only manager which supports _WIN_LAYER but not _WIN_HINTS
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
191 // what's more is has broken _WIN_LAYER support
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
192 metacity_hack |= 2;
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
193 }
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
194 XFree( args );
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
195 if (wm && metacity_hack == 3)
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
196 return wm;
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
197 }
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
198
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
199 if (metacity_hack == 1)
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
200 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Using workaround for Metacity bugs.\n" );
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
201
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
202 // --- netwm
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
203 if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems))
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
204 {
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
205 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
206 net_wm_support = 0;
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
207 for (i = 0; i < nitems; i++)
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
208 net_wm_support |= net_wm_support_state_test (args[i]);
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
209 XFree( args );
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
210 if (net_wm_support)
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
211 {
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
212 // ugly hack for broken OpenBox _NET_WM_STATE_FULLSCREEN support
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
213 // (in their implementation it only changes internal state of window, nothing more!!!)
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
214 if (net_wm_support & SUPPORT_FULLSCREEN)
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
215 {
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
216 if (x11_get_property(XA_BLACKBOX_PID, &args, &nitems))
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
217 {
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
218 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is a broken OpenBox.\n" );
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
219 net_wm_support=0;
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
220 XFree( args );
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
221 return vo_wm_Unknown;
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
222 }
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
223 XFree (args);
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
224 }
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
225 return vo_wm_NetWM;
8669
fd398a0b4b3b This time the patch is fixing much more that breaking :-)
arpi
parents: 8663
diff changeset
226 }
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
227 }
8676
579405800083 I have just installed IceWM 1.2.3 which supports NetWM and has broken
arpi
parents: 8669
diff changeset
228
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
229 if ( wm == vo_wm_Unknown ) mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Unknown wm type...\n" );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
230 return wm;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
231 }
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
232
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
233 void vo_init_atoms( void )
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
234 {
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
235 XA_INIT(_NET_SUPPORTED);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
236 XA_INIT(_NET_WM_STATE);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
237 XA_INIT(_NET_WM_STATE_FULLSCREEN);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
238 XA_INIT(_NET_WM_STATE_ABOVE);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
239 XA_INIT(_NET_WM_STATE_STAYS_ON_TOP);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
240 XA_INIT(_NET_WM_PID);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
241 XA_INIT(_WIN_PROTOCOLS);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
242 XA_INIT(_WIN_LAYER);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
243 XA_INIT(_WIN_HINTS);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
244 XA_INIT(_BLACKBOX_PID);
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
245 }
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
246
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
247 int vo_init( void )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
248 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
249 // int mScreen;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
250 int depth, bpp;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
251 unsigned int mask;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
252 // 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
253 // Display * mDisplay;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
254 XImage * mXImage = NULL;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
255 // Window mRootWin;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
256 XWindowAttributes attribs;
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
257 char* dispName;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
258
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
259 if(vo_depthonscreen) return 1; // already called
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
260
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
261 XSetErrorHandler(x11_errorhandler);
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
262
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
263 #if 0
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
264 if (!mDisplayName)
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
265 if (!(mDisplayName=getenv("DISPLAY")))
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
266 mDisplayName=strdup(":0.0");
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
267 #else
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
268 dispName = XDisplayName(mDisplayName);
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
269 #endif
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
270
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
271 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
272
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
273 mDisplay=XOpenDisplay(dispName);
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
274 if ( !mDisplay )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
275 {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
276 mp_msg(MSGT_VO,MSGL_ERR,"vo: couldn't open the X11 display (%s)!\n",dispName );
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
277 return 0;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
278 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
279 mScreen=DefaultScreen( mDisplay ); // Screen ID.
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
280 mRootWin=RootWindow( mDisplay,mScreen );// Root window ID.
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
281
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
282 vo_init_atoms();
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
283
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
284 #ifdef HAVE_XINERAMA
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
285 if(XineramaIsActive(mDisplay))
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
286 {
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
287 XineramaScreenInfo *screens;
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
288 int num_screens;
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
289
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
290 screens = XineramaQueryScreens(mDisplay, &num_screens);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
291 if(xinerama_screen >= num_screens) xinerama_screen = 0;
3461
6b4ff1eb79bf xinerama: allow to override xinerama screen_w/screen_h and setting size of screen where the window is placed
alex
parents: 2364
diff changeset
292 if (! vo_screenwidth)
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
293 vo_screenwidth=screens[xinerama_screen].width;
3461
6b4ff1eb79bf xinerama: allow to override xinerama screen_w/screen_h and setting size of screen where the window is placed
alex
parents: 2364
diff changeset
294 if (! vo_screenheight)
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
295 vo_screenheight=screens[xinerama_screen].height;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
296 xinerama_x = screens[xinerama_screen].x_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
297 xinerama_y = screens[xinerama_screen].y_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
298
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
299 XFree(screens);
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
300 }
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
301 else
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
302 #endif
4977
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
303 #ifdef HAVE_XF86VM
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
304 {
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
305 int clock;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
306 XF86VidModeGetModeLine( mDisplay,mScreen,&clock ,&modeline );
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
307 if ( !vo_screenwidth ) vo_screenwidth=modeline.hdisplay;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
308 if ( !vo_screenheight ) vo_screenheight=modeline.vdisplay;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
309 }
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
310 #endif
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
311 {
2364
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
312 if (! vo_screenwidth)
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
313 vo_screenwidth=DisplayWidth( mDisplay,mScreen );
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
314 if (! vo_screenheight)
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
315 vo_screenheight=DisplayHeight( mDisplay,mScreen );
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
316 }
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
317 // get color depth (from root window, or the best visual):
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
318 XGetWindowAttributes(mDisplay, mRootWin, &attribs);
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
319 depth=attribs.depth;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
320
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
321 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
322 Visual *visual;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
323
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
324 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
325 if (depth != -1)
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
326 mXImage=XCreateImage(mDisplay, visual, depth, ZPixmap,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
327 0, NULL, 1, 1, 8, 1);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
328 } else
7256
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
329 mXImage=XGetImage( mDisplay,mRootWin,0,0,1,1,AllPlanes,ZPixmap );
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
330
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
331 vo_depthonscreen = depth; // display depth on screen
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
332
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
333 // get bits/pixel from XImage structure:
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
334 if (mXImage == NULL) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
335 mask = 0;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
336 } else {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
337 /*
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
338 * for the depth==24 case, the XImage structures might use
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
339 * 24 or 32 bits of data per pixel. The global variable
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
340 * vo_depthonscreen stores the amount of data per pixel in the
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
341 * XImage structure!
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
342 *
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
343 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp?
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
344 */
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
345 bpp=mXImage->bits_per_pixel;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
346 if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
347 mask=mXImage->red_mask|mXImage->green_mask|mXImage->blue_mask;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
348 mp_msg(MSGT_VO,MSGL_V,"vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n",
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
349 mask,mXImage->red_mask,mXImage->green_mask,mXImage->blue_mask);
4181
159b3d0f517d patch by Fredrik Kuivinen <freku045@student.liu.se>
pl
parents: 4017
diff changeset
350 XDestroyImage( mXImage );
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
351 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
352 if(((vo_depthonscreen+7)/8)==2){
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
353 if(mask==0x7FFF) vo_depthonscreen=15; else
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
354 if(mask==0xFFFF) vo_depthonscreen=16;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
355 }
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
356 // XCloseDisplay( mDisplay );
1447
e82fbd67ae60 better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1415
diff changeset
357 /* slightly improved local display detection AST */
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
358 if ( strncmp(dispName, "unix:", 5) == 0)
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
359 dispName += 4;
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
360 else if ( strncmp(dispName, "localhost:", 10) == 0)
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
361 dispName += 9;
7492
5465cbd5c5ef Modern versions of OpenSSH listen on localhost to forward the X11 connection
arpi
parents: 7435
diff changeset
362 if (*dispName==':' && atoi(dispName+1)<10) mLocalDisplay=1; else mLocalDisplay=0;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
363 mp_msg(MSGT_VO,MSGL_INFO,"vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n",
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
364 vo_screenwidth,vo_screenheight,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
365 depth, vo_depthonscreen,
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
366 dispName,mLocalDisplay?"local":"remote");
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
367
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
368 vo_wm_type=vo_wm_detect();
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
369
7111
b65b78640d49 removed old input code
alex
parents: 7057
diff changeset
370 saver_off(mDisplay);
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
371 return 1;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
372 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
373
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
374 void vo_uninit( void )
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
375 {
6077
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
376 if (!mDisplay)
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
377 {
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
378 mp_msg(MSGT_VO, MSGL_V, "vo: x11 uninit called but X11 not inited..\n");
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
379 return;
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
380 }
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
381 // if( !vo_depthonscreen ) return;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
382 mp_msg(MSGT_VO,MSGL_V,"vo: uninit ...\n" );
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6013
diff changeset
383 XSetErrorHandler(NULL);
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
384 XCloseDisplay( mDisplay );
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6013
diff changeset
385 vo_depthonscreen = 0;
6111
582960ab7cc7 Workaround the bug in x11 vo's (if it's one) wich let a window in the way
albeu
parents: 6095
diff changeset
386 mDisplay=NULL;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
387 }
4436
0c2d2aaf9f86 added vo_x11_uninit
alex
parents: 4425
diff changeset
388
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
389 #include "../linux/keycodes.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
390 #include "wskeys.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
391
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
392 extern void mplayer_put_key(int code);
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
393
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
394 void vo_x11_putkey(int key){
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
395 switch ( key )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
396 {
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
397 case wsLeft: mplayer_put_key(KEY_LEFT); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
398 case wsRight: mplayer_put_key(KEY_RIGHT); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
399 case wsUp: mplayer_put_key(KEY_UP); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
400 case wsDown: mplayer_put_key(KEY_DOWN); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
401 case wsSpace: mplayer_put_key(' '); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
402 case wsEscape: mplayer_put_key(KEY_ESC); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
403 case wsEnter: mplayer_put_key(KEY_ENTER); break;
8215
feb6ec3cf5ba The OSD menus need more keys
albeu
parents: 8147
diff changeset
404 case wsBackSpace: mplayer_put_key(KEY_BS); break;
feb6ec3cf5ba The OSD menus need more keys
albeu
parents: 8147
diff changeset
405 case wsDelete: mplayer_put_key(KEY_DELETE); break;
feb6ec3cf5ba The OSD menus need more keys
albeu
parents: 8147
diff changeset
406 case wsInsert: mplayer_put_key(KEY_INSERT); break;
feb6ec3cf5ba The OSD menus need more keys
albeu
parents: 8147
diff changeset
407 case wsHome: mplayer_put_key(KEY_HOME); break;
feb6ec3cf5ba The OSD menus need more keys
albeu
parents: 8147
diff changeset
408 case wsEnd: mplayer_put_key(KEY_END); break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 614
diff changeset
409 case wsPageUp: mplayer_put_key(KEY_PAGE_UP); break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 614
diff changeset
410 case wsPageDown: mplayer_put_key(KEY_PAGE_DOWN); break;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
411 case wsq:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
412 case wsQ: mplayer_put_key('q'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
413 case wsp:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
414 case wsP: mplayer_put_key('p'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
415 case wsMinus:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
416 case wsGrayMinus: mplayer_put_key('-'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
417 case wsPlus:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
418 case wsGrayPlus: mplayer_put_key('+'); break;
464
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
419 case wsGrayMul:
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
420 case wsMul: mplayer_put_key('*'); break;
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
421 case wsGrayDiv:
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
422 case wsDiv: mplayer_put_key('/'); break;
3490
d33dac3fcfa1 applied Panagiotis' patch
gabucino
parents: 3461
diff changeset
423 case wsLess: mplayer_put_key('<'); break;
d33dac3fcfa1 applied Panagiotis' patch
gabucino
parents: 3461
diff changeset
424 case wsMore: mplayer_put_key('>'); break;
516
bdca96b27ceb add 'mixer support
pontscho
parents: 464
diff changeset
425 case wsm:
bdca96b27ceb add 'mixer support
pontscho
parents: 464
diff changeset
426 case wsM: mplayer_put_key('m'); break;
655
0bdfd4dc95f2 add o key
pontscho
parents: 651
diff changeset
427 case wso:
0bdfd4dc95f2 add o key
pontscho
parents: 651
diff changeset
428 case wsO: mplayer_put_key('o'); break;
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1456
diff changeset
429 default: if((key>='a' && key<='z')||(key>='A' && key<='Z')||
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1456
diff changeset
430 (key>='0' && key<='9')) mplayer_put_key(key);
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
431 }
369
b1a706452eeb pass keys a-z && A-Z
arpi_esp
parents: 326
diff changeset
432
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
433 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
434
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
435
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
436 // ----- Motif header: -------
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
437
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
438 #define MWM_HINTS_FUNCTIONS (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
439 #define MWM_HINTS_DECORATIONS (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
440 #define MWM_HINTS_INPUT_MODE (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
441 #define MWM_HINTS_STATUS (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
442
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
443 #define MWM_FUNC_ALL (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
444 #define MWM_FUNC_RESIZE (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
445 #define MWM_FUNC_MOVE (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
446 #define MWM_FUNC_MINIMIZE (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
447 #define MWM_FUNC_MAXIMIZE (1L << 4)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
448 #define MWM_FUNC_CLOSE (1L << 5)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
449
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
450 #define MWM_DECOR_ALL (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
451 #define MWM_DECOR_BORDER (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
452 #define MWM_DECOR_RESIZEH (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
453 #define MWM_DECOR_TITLE (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
454 #define MWM_DECOR_MENU (1L << 4)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
455 #define MWM_DECOR_MINIMIZE (1L << 5)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
456 #define MWM_DECOR_MAXIMIZE (1L << 6)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
457
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
458 #define MWM_INPUT_MODELESS 0
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
459 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
460 #define MWM_INPUT_SYSTEM_MODAL 2
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
461 #define MWM_INPUT_FULL_APPLICATION_MODAL 3
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
462 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
463
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
464 #define MWM_TEAROFF_WINDOW (1L<<0)
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
465
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
466 typedef struct
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
467 {
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
468 long flags;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
469 long functions;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
470 long decorations;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
471 long input_mode;
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
472 long state;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
473 } MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
474
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
475 extern MotifWmHints vo_MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
476 extern Atom vo_MotifHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
477 extern int vo_depthonscreen;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
478 extern int vo_screenwidth;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
479 extern int vo_screenheight;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
480
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
481 static MotifWmHints vo_MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
482 static Atom vo_MotifHints = None;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
483
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
484 // Note: always d==0 !
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
485 void vo_x11_decoration( Display * vo_Display,Window w,int d )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
486 {
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
487
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
488 if ( !WinID ) return;
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
489
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
490 if(vo_fsmode&1){
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
491 XSetWindowAttributes attr;
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5955
diff changeset
492 attr.override_redirect = (!d) ? True : False;
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
493 XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr);
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
494 // XMapWindow(vo_Display, w);
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
495 }
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
496
1415
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
497 if(vo_fsmode&8){
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
498 XSetTransientForHint (vo_Display, w, RootWindow(vo_Display,mScreen));
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
499 }
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
500
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
501 vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 );
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
502 if ( vo_MotifHints != None )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
503 {
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
504 memset( &vo_MotifWmHints,0,sizeof( MotifWmHints ) );
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
505 vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
506 if ( d )
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
507 {
6059
c0ae8c0eda72 fix Arpi's bugs
pontscho
parents: 6046
diff changeset
508 vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
509 d=MWM_DECOR_ALL;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
510 }
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
511 #if 0
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
512 vo_MotifWmHints.decorations=d|((vo_fsmode&2)?0:MWM_DECOR_MENU);
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
513 #else
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
514 vo_MotifWmHints.decorations=d|((vo_fsmode&2)?MWM_DECOR_MENU:0);
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
515 #endif
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
516 XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32,
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
517 PropModeReplace,(unsigned char *)&vo_MotifWmHints,(vo_fsmode&4)?4:5 );
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
518 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
519 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
520
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
521 void vo_x11_classhint( Display * display,Window window,char *name ){
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
522 XClassHint wmClass;
6401
15a6a5c78f35 Michele Balistreri <brain87@gmx.net>:
atmos4
parents: 6342
diff changeset
523 pid_t pid=getpid();
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
524 wmClass.res_name = name;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
525 wmClass.res_class = "MPlayer";
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
526 XSetClassHint(display,window,&wmClass);
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
527 XChangeProperty(display,window, XA_NET_WM_PID, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1);
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
528 }
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
529
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
530 Window vo_window = None;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
531 GC vo_gc = NULL;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
532 XSizeHints vo_hint;
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
533
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
534 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
535 void vo_setwindow( Window w,GC g ) {
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
536 vo_window=w; vo_gc=g;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1732
diff changeset
537 }
723
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
538 #endif
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
539
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
540 void vo_x11_uninit()
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
541 {
7111
b65b78640d49 removed old input code
alex
parents: 7057
diff changeset
542 saver_on(mDisplay);
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
543 if(vo_window!=None) vo_showcursor( mDisplay,vo_window );
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
544
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
545 #ifdef HAVE_NEW_GUI
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
546 /* destroy window only if it's not controlled by GUI */
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
547 if ( !use_gui )
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
548 #endif
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
549 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
550 if(vo_gc){
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
551 XSetBackground( mDisplay,vo_gc,0 );
7766
52171f231d4d fix memleak again
pontscho
parents: 7747
diff changeset
552 XFreeGC( mDisplay,vo_gc );
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
553 vo_gc=NULL;
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
554 }
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
555 if(vo_window!=None){
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
556 XClearWindow( mDisplay,vo_window );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
557 if (WinID < 0){
6179
c9ae6db39df0 Let X destroy the window
albeu
parents: 6164
diff changeset
558 XEvent xev;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
559 XUnmapWindow( mDisplay,vo_window );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
560 XDestroyWindow(mDisplay, vo_window);
6179
c9ae6db39df0 Let X destroy the window
albeu
parents: 6164
diff changeset
561 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != DestroyNotify || xev.xdestroywindow.event != vo_window );
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
562 }
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
563 vo_window=None;
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
564 }
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
565 vo_fs=0;
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
566 vo_old_width=vo_old_height=0;
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
567 }
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
568 }
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
569
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
570 int vo_mouse_timer_const = 30;
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
571 static int vo_mouse_counter = 30;
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
572
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
573 int vo_x11_check_events(Display *mydisplay){
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
574 int ret=0;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
575 XEvent Event;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
576 char buf[100];
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
577 KeySym keySym;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by Jrgen Keil <jk@tools.de>
arpi_esp
parents: 922
diff changeset
578 static XComposeStatus stat;
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
579
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
580 // unsigned long vo_KeyTable[512];
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
581
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
582 if ( ( vo_mouse_autohide )&&( --vo_mouse_counter == 0 ) ) vo_hidecursor( mydisplay,vo_window );
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
583
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
584 while ( XPending( mydisplay ) )
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
585 {
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
586 XNextEvent( mydisplay,&Event );
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
587 #ifdef HAVE_NEW_GUI
5061
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
588 if ( use_gui )
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
589 {
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
590 guiGetEvent( 0,(char*)&Event );
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
591 if ( vo_window != Event.xany.window ) continue;
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
592 }
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
593 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
594 // printf("\rEvent.type=%X \n",Event.type);
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
595 switch( Event.type )
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
596 {
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
597 case Expose:
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
598 ret|=VO_EVENT_EXPOSE;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
599 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
600 case ConfigureNotify:
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
601 // if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
602 // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break;
8086
51cab3e229d4 fix by Pontscho
nexus
parents: 8027
diff changeset
603 if ( vo_window == None ) break;
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
604 vo_dwidth=Event.xconfigure.width;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
605 vo_dheight=Event.xconfigure.height;
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
606 #if 0
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
607 /* when resizing, x and y are zero :( */
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
608 vo_dx=Event.xconfigure.x;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
609 vo_dy=Event.xconfigure.y;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
610 #else
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
611 {
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
612 Window root;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
613 int foo;
6140
44dcc49a0d80 64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents: 6111
diff changeset
614 Window win;
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
615 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo,
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
616 &foo/*width*/, &foo/*height*/, &foo, &foo);
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
617 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0,
6140
44dcc49a0d80 64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents: 6111
diff changeset
618 &vo_dx, &vo_dy, &win);
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
619 }
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
620 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
621 ret|=VO_EVENT_RESIZE;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
622 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
623 case KeyPress:
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
624 {
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
625 int key;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
626 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
627 key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
628 #ifdef HAVE_NEW_GUI
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
629 if ( ( use_gui )&&( key == wsEnter ) ) break;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
630 #endif
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
631 vo_x11_putkey( key );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
632 ret|=VO_EVENT_KEYPRESS;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
633 }
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
634 break;
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
635 case MotionNotify:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
636 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; }
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
637 break;
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
638 case ButtonPress:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
639 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; }
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
640 // Ignore mouse whell press event
5656
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
641 if(Event.xbutton.button > 3) {
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
642 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1);
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
643 break;
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
644 }
5062
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
645 #ifdef HAVE_NEW_GUI
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
646 // Ignor mouse button 1 - 3 under gui
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
647 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break;
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
648 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
649 mplayer_put_key((MOUSE_BTN0+Event.xbutton.button-1)|MP_KEY_DOWN);
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
650 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
651 case ButtonRelease:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
652 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; }
5062
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
653 #ifdef HAVE_NEW_GUI
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
654 // Ignor mouse button 1 - 3 under gui
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
655 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break;
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
656 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
657 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1);
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
658 break;
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
659 case PropertyNotify:
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
660 {
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
661 char * name = XGetAtomName( mydisplay,Event.xproperty.atom );
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
662 int wm = vo_wm_Unknown;
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
663
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
664 if ( !name ) break;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
665
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
666 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom );
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
667
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
668 XFree( name );
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
669 }
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
670 break;
723
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
671 }
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
672 }
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
673 return ret;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
674 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
675
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
676 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
677 {
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
678 vo_hint.flags=PPosition | PSize | PWinGravity;
8692
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
679 if(vo_x11_keepaspect)
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
680 {
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
681 vo_hint.flags |= PAspect;
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
682 vo_hint.min_aspect.x = width;
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
683 vo_hint.min_aspect.y = height;
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
684 vo_hint.max_aspect.x = width;
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
685 vo_hint.max_aspect.y = height;
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
686 }
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8676
diff changeset
687
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
688 vo_hint.x=x; vo_hint.y=y; vo_hint.width=width; vo_hint.height=height;
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
689 if ( max )
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
690 {
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
691 vo_hint.max_width=width; vo_hint.max_height=height;
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
692 vo_hint.flags|=PMaxSize;
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
693 } else { vo_hint.max_width=0; vo_hint.max_height=0; }
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
694 vo_hint.win_gravity=StaticGravity;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
695 XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
696 }
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
697
8866
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
698 int vo_x11_get_gnome_layer (Display * mDisplay, Window win)
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
699 {
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
700 Atom type;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
701 int format;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
702 unsigned long nitems;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
703 unsigned long bytesafter;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
704 unsigned short *args = NULL;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
705
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
706 if (XGetWindowProperty (mDisplay, win, XA_WIN_LAYER, 0, 16384,
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
707 False, AnyPropertyType, &type, &format, &nitems,
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
708 &bytesafter, (unsigned char **) &args) == Success
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
709 && nitems > 0 && args)
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
710 {
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
711 mp_msg (MSGT_VO, MSGL_STATUS, "[x11] original window layer is %d.\n", *args);
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
712 return *args;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
713 }
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
714 return WIN_LAYER_NORMAL;
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
715 }
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
716
8864
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
717 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
718 {
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
719 if ( WinID >= 0 ) return;
8864
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
720
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
721 // window manager could be changed during play
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
722 vo_wm_type=vo_wm_detect();
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
723
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
724 switch ( vo_wm_type )
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
725 { case vo_wm_Layered:
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
726 {
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
727 XClientMessageEvent xev;
8866
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
728
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
729 if (layer) orig_layer=vo_x11_get_gnome_layer( mDisplay, vo_window );
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
730
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
731 memset(&xev, 0, sizeof(xev));
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
732 xev.type = ClientMessage;
8388
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
733 xev.display= mDisplay;
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
734 xev.window = vo_window;
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
735 xev.message_type = XA_WIN_LAYER;
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
736 xev.format = 32;
8866
f84a5237f914 Remember window layer befor changing it.
filon
parents: 8864
diff changeset
737 xev.data.l[0] = layer?ice_layer:orig_layer; // if not fullscreen, stay on default layer
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
738 xev.data.l[1] = CurrentTime;
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
739 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Layered style stay on top ( layer %d ).\n",xev.data.l[0] );
8864
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
740 printf( "[x11] Layered style stay on top ( layer %d ).\n",xev.data.l[0] );
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
741 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, (XEvent *) &xev);
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
742 break;
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
743 }
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
744 case vo_wm_NetWM:
8388
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
745 {
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
746 XClientMessageEvent xev;
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
747 char *state;
8645
8d142510995d That patch fixes fullscreen on sawfish 1.2.
arpi
parents: 8446
diff changeset
748
8388
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
749 memset( &xev,0,sizeof( xev ) );
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
750 xev.type=ClientMessage;
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
751 xev.message_type=XA_NET_WM_STATE;
8388
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
752 xev.display=mDisplay;
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
753 xev.window=vo_window;
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
754 xev.format=32;
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
755 xev.data.l[0]=layer;
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
756
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
757 if (net_wm_support & SUPPORT_ABOVE)
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
758 {
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
759 xev.data.l[1]=XA_NET_WM_STATE_ABOVE;
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
760 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
761 } else
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
762 if (net_wm_support & SUPPORT_STAYS_ON_TOP)
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
763 {
8742
241f40ef5e28 More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents: 8716
diff changeset
764 xev.data.l[1]=XA_NET_WM_STATE_STAYS_ON_TOP;
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
765 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
766 } else
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
767 if (net_wm_support & SUPPORT_FULLSCREEN)
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
768 {
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
769 xev.data.l[1]=XA_NET_WM_STATE_FULLSCREEN;
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
770 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
8445
694cda2f75d3 use more methods to get the fs window on top
henry
parents: 8410
diff changeset
771 }
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
772 state = XGetAtomName (mDisplay, xev.data.l[1]);
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
773 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ). Using state %s.\n",layer,state );
8864
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
774 printf( "[x11] NET style stay on top ( layer %d ). Using state %s.\n",layer,state );
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
775 XFree (state);
8388
45eb2d4d633c The detection of a NetWM class window manager hints is tested before
arpi
parents: 8354
diff changeset
776 }
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
777 }
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
778 }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
779
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
780 void vo_x11_fullscreen( void )
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
781 {
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
782 int x,y,w,h;
5919
60cf2bca993f some bug fix
pontscho
parents: 5910
diff changeset
783
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
784 if ( WinID >= 0 ) return;
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
785
8660
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
786 // window manager could be changed during play
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
787 vo_wm_type=vo_wm_detect();
39476cbd1673 I have looked at the fullscreen code and realized that there are
arpi
parents: 8653
diff changeset
788
7435
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
789 if ( vo_fs ){
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
790 // fs->win
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
791 if(vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) return;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
792 vo_fs=VO_FALSE;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
793 x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
794 } else {
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
795 // win->fs
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
796 if(vo_old_width &&
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
797 (vo_dwidth==vo_screenwidth && vo_dwidth!=vo_old_width) &&
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
798 (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
799 vo_fs=VO_TRUE;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
800 vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
801 x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
c7a9bcecba07 d_width==screenwidth && -fs hopefully fixed
arpi
parents: 7256
diff changeset
802 }
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
803 if (net_wm_support!=SUPPORT_FULLSCREEN || metacity_hack==1)
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
804 {
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
805 vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
806 vo_x11_sizehint( x,y,w,h,0 );
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
807 }
8864
b8c271750450 - sync with x11_common
pontscho
parents: 8835
diff changeset
808 vo_x11_setlayer( mDisplay,vo_window,vo_fs );
8835
664b0612f950 Fixed metacity + xv behavior (something broke it lately).
filon
parents: 8783
diff changeset
809 if (net_wm_support!=SUPPORT_FULLSCREEN || metacity_hack==1)
8653
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
810 {
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
811 if(vo_wm_type==vo_wm_Unknown && !(vo_fsmode&16))
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
812 // XUnmapWindow( mDisplay,vo_window ); // required for MWM
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
813 XWithdrawWindow(mDisplay,vo_window,mScreen);
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
814 XMoveResizeWindow( mDisplay,vo_window,x,y,w,h );
5af3d90a8f6b NetWM fs. switching cleanup
arpi
parents: 8645
diff changeset
815 }
6342
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
816 #ifdef HAVE_XINERAMA
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
817 vo_x11_xinerama_move(mDisplay,vo_window);
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
818 #endif
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
819 XMapRaised( mDisplay,vo_window );
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
820 XRaiseWindow( mDisplay,vo_window );
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
821 XFlush( mDisplay );
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
822 }
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
823
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
824 void saver_on(Display *mDisplay) {
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
825
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
826 #ifdef HAVE_XDPMS
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
827 int nothing;
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
828 if (dpms_disabled)
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
829 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
830 if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
831 {
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
832 if (!DPMSEnable(mDisplay)) { // restoring power saving settings
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
833 mp_msg(MSGT_VO,MSGL_WARN,"DPMS not available?\n");
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
834 } else {
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
835 // DPMS does not seem to be enabled unless we call DPMSInfo
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
836 BOOL onoff;
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
837 CARD16 state;
8097
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
838 DPMSForceLevel(mDisplay, DPMSModeOn);
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
839 DPMSInfo(mDisplay, &state, &onoff);
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
840 if (onoff) {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
841 mp_msg(MSGT_VO,MSGL_INFO,"Successfully enabled DPMS\n");
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
842 } else {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
843 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
844 }
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
845 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
846 }
7633
c0fa4d2e39a3 mayeb fixed dpms/screensaver issues
arpi
parents: 7572
diff changeset
847 dpms_disabled=0;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
848 }
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
849 #endif
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
850
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
851 if (timeout_save)
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
852 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
853 int dummy, interval, prefer_blank, allow_exp;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
854 XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, &allow_exp);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
855 XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, allow_exp);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
856 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
7633
c0fa4d2e39a3 mayeb fixed dpms/screensaver issues
arpi
parents: 7572
diff changeset
857 timeout_save=0;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
858 }
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
859
8097
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
860 if (xscreensaver_was_running && stop_xscreensaver) {
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
861 system("cd /; xscreensaver -no-splash &");
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
862 xscreensaver_was_running = 0;
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
863 }
8354
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
864 if (kdescreensaver_was_running && stop_xscreensaver) {
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
865 system("dcop kdesktop KScreensaverIface enable true 2>/dev/null >/dev/null");
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
866 kdescreensaver_was_running = 0;
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
867 }
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
868
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
869
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
870 }
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
871
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
872 void saver_off(Display *mDisplay) {
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
873
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
874 int interval, prefer_blank, allow_exp;
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
875 #ifdef HAVE_XDPMS
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
876 int nothing;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
877
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
878 if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
879 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
880 BOOL onoff;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
881 CARD16 state;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
882 DPMSInfo(mDisplay, &state, &onoff);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
883 if (onoff)
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
884 {
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
885 Status stat;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
886 mp_msg(MSGT_VO,MSGL_INFO,"Disabling DPMS\n");
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
887 dpms_disabled=1;
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
888 stat = DPMSDisable(mDisplay); // monitor powersave off
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
889 mp_msg(MSGT_VO,MSGL_V,"DPMSDisable stat: %d\n", stat);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
890 }
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
891 }
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
892 #endif
8097
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
893 if (!timeout_save) {
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
894 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
895 if (timeout_save)
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
896 XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);
440dd85936d1 yet another screensaver fix
henry
parents: 8086
diff changeset
897 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
898 // turning off screensaver
8354
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
899 if (stop_xscreensaver && !xscreensaver_was_running)
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
900 {
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
901 xscreensaver_was_running = (system("xscreensaver-command -version 2>/dev/null >/dev/null")==0);
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
902 if (xscreensaver_was_running)
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
903 system("xscreensaver-command -exit 2>/dev/null >/dev/null");
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
904 }
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
905 if (stop_xscreensaver && !kdescreensaver_was_running)
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
906 {
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
907 kdescreensaver_was_running=(system("dcop kdesktop KScreensaverIface isEnabled 2>/dev/null | sed 's/1/true/g' | grep true 2>/dev/null >/dev/null")==0);
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
908 if (kdescreensaver_was_running)
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
909 system("dcop kdesktop KScreensaverIface enable false 2>/dev/null >/dev/null");
8a0b6e083280 This patch fixes the screensaver issues in mplayer. It will correctly read
arpi
parents: 8215
diff changeset
910 }
326
f6b5c2dbc88e OSD alpha renderers moved to osd.c
arpi_esp
parents: 324
diff changeset
911 }
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
912
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
913 static XErrorHandler old_handler = NULL;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
914 static int selectinput_err = 0;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
915 static int x11_selectinput_errorhandler(Display *display, XErrorEvent *event)
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
916 {
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
917 if (event->error_code == BadAccess) {
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
918 selectinput_err = 1;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
919 mp_msg(MSGT_VO, MSGL_ERR, "X11 error : BadAccess during XSelectInput Call\n");
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
920 mp_msg(MSGT_VO, MSGL_ERR, "X11 error : The 'ButtonPressMask' mask of specified window has probably already used by another appication(see man XSelectInput) \n");
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
921 /* If you think mplayer should shutdown with this error, comments out following line */
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
922 return 0;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
923 }
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
924 if (old_handler != NULL) old_handler(display, event);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
925 else x11_errorhandler(display, event);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
926 return 0;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
927 }
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
928
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
929 void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask)
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
930 {
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
931 XSync(display, False);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
932 old_handler = XSetErrorHandler(x11_selectinput_errorhandler);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
933 selectinput_err = 0;
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
934 XSelectInput(display, w, event_mask);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
935 XSync(display, False);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
936 XSetErrorHandler(old_handler);
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
937 if (selectinput_err) {
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
938 mp_msg(MSGT_VO, MSGL_ERR, "X11 error : Mplayer discards mouse control and retry XSelectInput...\n");
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
939 XSelectInput(display, w, event_mask & (~(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) );
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
940 }
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6401
diff changeset
941 }
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
942
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
943 #ifdef HAVE_XINERAMA
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
944 void vo_x11_xinerama_move(Display *dsp, Window w)
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
945 {
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
946 if(XineramaIsActive(dsp))
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
947 {
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
948 /* printf("XXXX Xinerama screen: x: %hd y: %hd\n",xinerama_x,xinerama_y); */
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
949 XMoveWindow(dsp,w,xinerama_x,xinerama_y);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
950 }
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
951 }
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
952 #endif
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
953
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
954 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
955 void vo_vm_switch(uint32_t X, uint32_t Y, int* modeline_width, int* modeline_height)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
956 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
957 unsigned int vm_event, vm_error;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
958 unsigned int vm_ver, vm_rev;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
959 int i,j,have_vm=0;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
960
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
961 int modecount;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
962
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
963 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
964 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
965 mp_msg(MSGT_VO,MSGL_V,"XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev);
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
966 have_vm=1;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
967 } else
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
968 mp_msg(MSGT_VO,MSGL_WARN,"XF86VidMode Extenstion not available.\n");
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
969
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
970 if (have_vm) {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
971 if (vidmodes==NULL)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
972 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
973 j=0;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
974 *modeline_width=vidmodes[0]->hdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
975 *modeline_height=vidmodes[0]->vdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
976
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
977 for (i=1; i<modecount; i++)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
978 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y))
5538
70725449c947 VM Fix by Uwe.Reder@3soft.de
atmos4
parents: 5062
diff changeset
979 if ( (vidmodes[i]->hdisplay <= *modeline_width ) && (vidmodes[i]->vdisplay <= *modeline_height) )
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
980 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
981 *modeline_width=vidmodes[i]->hdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
982 *modeline_height=vidmodes[i]->vdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
983 j=i;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
984 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
985
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
986 mp_msg(MSGT_VO,MSGL_INFO,"XF86VM: Selected video mode %dx%d for image size %dx%d.\n",*modeline_width, *modeline_height, X, Y);
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
987 XF86VidModeLockModeSwitch(mDisplay,mScreen,0);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
988 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
989 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
990 X=(vo_screenwidth-*modeline_width)/2;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
991 Y=(vo_screenheight-*modeline_height)/2;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
992 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
993 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
994 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
995
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
996 void vo_vm_close(Display *dpy)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
997 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
998 #ifdef HAVE_NEW_GUI
5019
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
999 if (vidmodes!=NULL && vo_window != None)
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
1000 #else
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
1001 if (vidmodes!=NULL)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
1002 #endif
5019
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1003 {
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1004 int i, modecount;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1005 int screen; screen=DefaultScreen( dpy );
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1006
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1007 free(vidmodes); vidmodes=NULL;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1008 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1009 for (i=0; i<modecount; i++)
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1010 if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight))
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1011 {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
1012 mp_msg(MSGT_VO,MSGL_INFO,"\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight);
5019
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1013 break;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1014 }
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1015
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1016 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1017 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1018 free(vidmodes);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
1019 }
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
1020 }
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
1021 #endif
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
1022
7256
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1023 #endif /* X11_FULLSCREEN */
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1024
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1025
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1026 /*
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1027 * 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
1028 * 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
1029 * 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
1030 * >= 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
1031 */
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1032 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return)
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1033 {
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1034 XVisualInfo visual_tmpl;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1035 XVisualInfo *visuals;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1036 int nvisuals, i;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1037 int bestvisual = -1;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1038 int bestvisual_depth = -1;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1039
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1040 visual_tmpl.screen = screen;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1041 visual_tmpl.class = TrueColor;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1042 visuals = XGetVisualInfo(dpy,
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1043 VisualScreenMask | VisualClassMask, &visual_tmpl,
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1044 &nvisuals);
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1045 if (visuals != NULL) {
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1046 for (i = 0; i < nvisuals; i++) {
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1047 mp_msg(MSGT_VO,MSGL_V,"vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1048 visuals[i].visualid, visuals[i].depth,
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1049 visuals[i].red_mask, visuals[i].green_mask,
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1050 visuals[i].blue_mask);
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1051 /*
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1052 * save the visual index and it's depth, if this is the first
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1053 * truecolor visul, or a visual that is 'preferred' over the
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1054 * previous 'best' visual
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1055 */
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1056 if (bestvisual_depth == -1
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1057 || (visuals[i].depth >= 15
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1058 && ( visuals[i].depth < bestvisual_depth
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1059 || bestvisual_depth < 15))) {
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1060 bestvisual = i;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1061 bestvisual_depth = visuals[i].depth;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1062 }
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1063 }
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1064
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1065 if (bestvisual != -1 && visual_return != NULL)
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1066 *visual_return = visuals[bestvisual].visual;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1067
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1068 XFree(visuals);
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1069 }
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1070 return bestvisual_depth;
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1071 }
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 7111
diff changeset
1072
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1073
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1074 static Colormap cmap = None;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1075 static XColor cols[256];
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1076 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
1077
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1078
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1079 Colormap vo_x11_create_colormap(XVisualInfo *vinfo)
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1080 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1081 unsigned k, r, g, b, ru, gu, bu, m, rv, gv, bv, rvu, gvu, bvu;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1082
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1083 if (vinfo->class != DirectColor)
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1084 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1085
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1086 /* can this function get called twice or more? */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1087 if (cmap) return cmap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1088 cm_size = vinfo->colormap_size;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1089 red_mask = vinfo->red_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1090 green_mask = vinfo->green_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1091 blue_mask = vinfo->blue_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1092 ru = (red_mask&(red_mask-1))^red_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1093 gu = (green_mask&(green_mask-1))^green_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1094 bu = (blue_mask&(blue_mask-1))^blue_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1095 rvu = 65536ull*ru/(red_mask + ru);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1096 gvu = 65536ull*gu/(green_mask + gu);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1097 bvu = 65536ull*bu/(blue_mask + bu);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1098 r = g = b = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1099 rv = gv = bv = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1100 m = DoRed|DoGreen|DoBlue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1101 for (k = 0; k < cm_size; k++) {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1102 int t;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1103 cols[k].pixel = r|g|b;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1104 cols[k].red = rv;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1105 cols[k].green = gv;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1106 cols[k].blue = bv;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1107 cols[k].flags = m;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1108 t = (r + ru) & red_mask; if (t < r) m &= ~DoRed; r = t;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1109 t = (g + gu) & green_mask; if (t < g) m &= ~DoGreen; g = t;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1110 t = (b + bu) & blue_mask; if (t < b) m &= ~DoBlue; b = t;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1111 rv += rvu;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1112 gv += gvu;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1113 bv += bvu;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1114 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1115 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1116 XStoreColors(mDisplay, cmap, cols, cm_size);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1117 return cmap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1118 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1119
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1120 /*
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1121 * 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
1122 * 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
1123 * 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
1124 * 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
1125 */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1126 /* 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
1127 static int vo_gamma = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1128 static int vo_brightness = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1129 static int vo_contrast = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1130
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1131
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1132 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
1133 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1134 float gamma, brightness, contrast;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1135 float rf, gf, bf;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1136 int k;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1137
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1138 /*
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1139 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1140 * of TrueColor-ed window but be careful:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1141 * unlike the colormaps, which are private for the X client
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1142 * who created them and thus automatically destroyed on client
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1143 * disconnect, this gamma ramp is a system-wide (X-server-wide)
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1144 * setting and _must_ be restored before the process exit.
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1145 * Unforunately when the process crashes (or get killed
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1146 * for some reason) it is impossible to restore the setting,
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1147 * and such behaviour could be rather annoying for the users.
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1148 */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1149 if (cmap == None) return VO_NOTAVAIL;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1150
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1151 if (!strcasecmp(name, "brightness")) vo_brightness = value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1152 else if (!strcasecmp(name, "contrast")) vo_contrast = value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1153 else if (!strcasecmp(name, "gamma")) vo_gamma = value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1154 else return VO_NOTIMPL;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1155
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1156 brightness = 0.01*vo_brightness;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1157 contrast = tan(0.0095*(vo_contrast+100)*M_PI/4);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1158 gamma = pow(2, -0.02*vo_gamma);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1159
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1160 rf = (float)((red_mask & (red_mask - 1)) ^ red_mask)/red_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1161 gf = (float)((green_mask & (green_mask - 1)) ^ green_mask)/green_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1162 bf = (float)((blue_mask & (blue_mask - 1)) ^ blue_mask)/blue_mask;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1163
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1164 /* now recalculate the colormap using the newly set value */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1165 for (k = 0; k < cm_size; k++) {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1166 float s;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1167
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1168 s = pow(rf*k, gamma);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1169 s = (s - 0.5)*contrast + 0.5;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1170 s += brightness;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1171 if (s < 0) s = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1172 if (s > 1) s = 1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1173 cols[k].red = (unsigned short)(s * 65535);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1174
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1175 s = pow(gf*k, gamma);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1176 s = (s - 0.5)*contrast + 0.5;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1177 s += brightness;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1178 if (s < 0) s = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1179 if (s > 1) s = 1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1180 cols[k].green = (unsigned short)(s * 65535);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1181
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1182 s = pow(bf*k, gamma);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1183 s = (s - 0.5)*contrast + 0.5;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1184 s += brightness;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1185 if (s < 0) s = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1186 if (s > 1) s = 1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1187 cols[k].blue = (unsigned short)(s * 65535);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1188 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1189
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1190 XStoreColors(mDisplay, cmap, cols, cm_size);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1191 XFlush(mDisplay);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1192 return VO_TRUE;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1193 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1194
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1195 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
1196 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1197 if (cmap == None) return VO_NOTAVAIL;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1198 if (!strcasecmp(name, "brightness")) *value = vo_brightness;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1199 else if (!strcasecmp(name, "contrast")) *value = vo_contrast;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1200 else if (!strcasecmp(name, "gamma")) *value = vo_gamma;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1201 else return VO_NOTIMPL;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8097
diff changeset
1202 return VO_TRUE;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1203 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1204
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7766
diff changeset
1205