annotate libvo/x11_common.c @ 6570:52ecfeddf864

Changed the -pass option to -passwd to avoid clash with mencoder option.
author bertrand
date Tue, 25 Jun 2002 23:56:33 +0000
parents 15a6a5c78f35
children ce67cc1f0beb
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>
6401
15a6a5c78f35 Michele Balistreri <brain87@gmx.net>:
atmos4
parents: 6342
diff changeset
4 #include <inttypes.h>
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
5
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
6 #include "config.h"
5998
79977d64bb99 upsz, 10l
pontscho
parents: 5997
diff changeset
7 #include "mp_msg.h"
6401
15a6a5c78f35 Michele Balistreri <brain87@gmx.net>:
atmos4
parents: 6342
diff changeset
8 #include "x11_common.h"
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
9
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
10 #ifdef X11_FULLSCREEN
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
11
440
d19a3da6ac13 Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;)
gabucino
parents: 416
diff changeset
12 #include <string.h>
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
13 #include <unistd.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
14 #include <sys/mman.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
15
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
16 #include "video_out.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
17
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
18 #include <X11/Xmd.h>
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
19 #include <X11/Xlib.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
20 #include <X11/Xutil.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
21 #include <X11/Xatom.h>
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
22
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
23 #ifdef HAVE_XDPMS
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
24 #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
25 #endif
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
26
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
27 #ifdef HAVE_XINERAMA
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
28 #include <X11/extensions/Xinerama.h>
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
29 #endif
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
30
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
31 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
32 #include <X11/extensions/xf86vmode.h>
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
33 #endif
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
34
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
35 #ifdef HAVE_NEW_INPUT
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 #endif
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
39
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
40 #ifdef HAVE_NEW_GUI
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
41 #include "../Gui/interface.h"
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
42 #include "../mplayer.h"
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
43 #endif
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
44
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
45 /*
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
46 * If SCAN_VISUALS is defined, vo_init() scans all available TrueColor
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
47 * visuals for the 'best' visual for MPlayer video display. Note that
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
48 * the 'best' visual might be different from the default visual that
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
49 * is in use on the root window of the display/screen.
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
50 */
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
51 #define SCAN_VISUALS
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
52
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
53 #define vo_wm_Unknown 0
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
54 #define vo_wm_NetWM 1
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
55 #define vo_wm_KDE 2
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
56 #define vo_wm_IceWM 3
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
57 #define vo_wm_WMakerStyle 4
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
58
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
59 int ice_layer=12;
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
60 int stop_xscreensaver=0;
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
61
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
62 extern int verbose;
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1447
diff changeset
63
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
64 static int dpms_disabled=0;
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
65 static int timeout_save=0;
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
66 static int xscreensaver_was_running=0;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
67
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
68 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
69 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
70 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
71 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
72 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
73
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3490
diff changeset
74 /* output window id */
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3490
diff changeset
75 int WinID=-1;
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
76 int vo_mouse_autohide = 0;
6089
39c2bfe5c267 small fixes
pontscho
parents: 6077
diff changeset
77 int vo_wm_type = -1;
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
78
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
79 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
80 int xinerama_screen = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
81 int xinerama_x = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
82 int xinerama_y = 0;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
83 #endif
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
84 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
85 XF86VidModeModeInfo **vidmodes=NULL;
4977
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
86 XF86VidModeModeLine modeline;
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
87 #endif
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
88
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
89 void vo_hidecursor ( Display *disp , Window win )
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
90 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
91 Cursor no_ptr;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
92 Pixmap bm_no;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
93 XColor black,dummy;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
94 Colormap colormap;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
95 static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 };
3954
arpi
parents: 3951
diff changeset
96
arpi
parents: 3951
diff changeset
97 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
98
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
99 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
100 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
101 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
102 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
103 XDefineCursor(disp,win,no_ptr);
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
104 XFreeCursor( disp,no_ptr );
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
105 }
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
106
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
107 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
108 {
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
109 if ( WinID==0 ) return;
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
110 XDefineCursor( disp,win,0 );
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
111 }
384
b0e4e5744899 Autohide X11 cursor
lgb
parents: 369
diff changeset
112
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
113 #ifdef SCAN_VISUALS
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
114 /*
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
115 * Scan the available visuals on this Display/Screen. Try to find
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
116 * the 'best' available TrueColor visual that has a decent color
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
117 * depth (at least 15bit). If there are multiple visuals with depth
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
118 * >= 15bit, we prefer visuals with a smaller color depth.
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
119 */
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
120 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return)
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
121 {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
122 XVisualInfo visual_tmpl;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
123 XVisualInfo *visuals;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
124 int nvisuals, i;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
125 int bestvisual = -1;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
126 int bestvisual_depth = -1;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
127
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
128 visual_tmpl.screen = screen;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
129 visual_tmpl.class = TrueColor;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
130 visuals = XGetVisualInfo(dpy,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
131 VisualScreenMask | VisualClassMask, &visual_tmpl,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
132 &nvisuals);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
133 if (visuals != NULL) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
134 for (i = 0; i < nvisuals; i++) {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
135 mp_msg(MSGT_VO,MSGL_V,"vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
136 visuals[i].visualid, visuals[i].depth,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
137 visuals[i].red_mask, visuals[i].green_mask,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
138 visuals[i].blue_mask);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
139 /*
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
140 * save the visual index and it's depth, if this is the first
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
141 * truecolor visul, or a visual that is 'preferred' over the
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
142 * previous 'best' visual
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
143 */
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
144 if (bestvisual_depth == -1
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
145 || (visuals[i].depth >= 15
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
146 && ( visuals[i].depth < bestvisual_depth
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
147 || bestvisual_depth < 15))) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
148 bestvisual = i;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
149 bestvisual_depth = visuals[i].depth;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
150 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
151 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
152
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
153 if (bestvisual != -1 && visual_return != NULL)
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
154 *visual_return = visuals[bestvisual].visual;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
155
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
156 XFree(visuals);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
157 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
158 return bestvisual_depth;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
159 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
160 #endif
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
161
6077
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
162 static int x11_errorhandler(Display *display, XErrorEvent *event)
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
163 {
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
164 #define MSGLEN 60
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
165 char msg[MSGLEN];
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
166
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
167 XGetErrorText(display, event->error_code, (char *)&msg, MSGLEN);
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
168
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
169 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
170
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
171 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
172 event->type, event->display, event->resourceid, event->serial);
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
173 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
174 event->error_code, event->request_code, event->minor_code);
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
175
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
176 abort();
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
177 //exit_player("X11 error");
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
178 #undef MSGLEN
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
179 }
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
180
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
181 int vo_wm_string_test( char * name )
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
182 {
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
183 if ( !strncmp( name,"_ICEWM_TRAY",11 ) )
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
184 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" ); return vo_wm_IceWM; }
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
185 if ( !strncmp( name,"_KDE_",5 ) )
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
186 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); return vo_wm_KDE; }
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
187 if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) )
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
188 { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); return vo_wm_WMakerStyle; }
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
189 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",win,name,xev.xproperty.atom );
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
190 return vo_wm_Unknown;
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
191 }
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
192
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
193 int vo_wm_detect( void )
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
194 {
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
195 Atom type;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
196 Window win;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
197 XEvent xev;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
198 int c = 0;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
199 int wm = vo_wm_Unknown;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
200 int format;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
201 unsigned long nitems, bytesafter;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
202 unsigned char * args = NULL;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
203 char * name = NULL;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
204
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
205 if ( WinID >= 0 ) return vo_wm_Unknown;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
206
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
207 #if 1
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
208 // --- netwm
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
209 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
6164
aee9c32349a9 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents: 6140
diff changeset
210 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
211 {
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
212 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
213 XFree( args );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
214 return vo_wm_NetWM;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
215 }
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
216 #endif
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
217 // --- other wm
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
218 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Create window for WM detect ...\n" );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
219 win=XCreateSimpleWindow( mDisplay,mRootWin,vo_screenwidth,vo_screenheight,1,1,0,0,0 );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
220 XSelectInput( mDisplay,win,PropertyChangeMask | StructureNotifyMask );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
221 XMapWindow( mDisplay,win );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
222 XMoveWindow( mDisplay,win,vo_screenwidth,vo_screenheight );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
223 do
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
224 {
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
225 XCheckWindowEvent( mDisplay,win,PropertyChangeMask | StructureNotifyMask,&xev );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
226
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
227 if ( xev.type == PropertyNotify )
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
228 {
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
229 name=XGetAtomName( mDisplay,xev.xproperty.atom );
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
230 if ( !name ) break;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
231
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
232 wm=vo_wm_string_test( name );
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
233 if ( wm != vo_wm_Unknown ) break;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
234 XFree( name ); name=NULL;
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
235 }
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
236 } while( c++ < 25 );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
237 if ( name ) XFree( name );
6089
39c2bfe5c267 small fixes
pontscho
parents: 6077
diff changeset
238 XUnmapWindow( mDisplay,win );
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
239 XDestroyWindow( mDisplay,win );
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
240 #ifdef MP_DEBUG
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
241 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
242 #endif
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
243 return wm;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
244 }
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
245
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
246 int vo_init( void )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
247 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
248 // int mScreen;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
249 int depth, bpp;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
250 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
251 // 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
252 // Display * mDisplay;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
253 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
254 // Window mRootWin;
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
255 XWindowAttributes attribs;
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
256 char* dispName;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
257
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
258 if(vo_depthonscreen) return 1; // already called
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
259
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
260 XSetErrorHandler(x11_errorhandler);
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
261
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
262 #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
263 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
264 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
265 mDisplayName=strdup(":0.0");
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
266 #else
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
267 dispName = XDisplayName(mDisplayName);
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
268 #endif
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
269
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
270 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
271
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
272 mDisplay=XOpenDisplay(dispName);
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
273 if ( !mDisplay )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
274 {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
275 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
276 return 0;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
277 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
278 mScreen=DefaultScreen( mDisplay ); // Screen ID.
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
279 mRootWin=RootWindow( mDisplay,mScreen );// Root window ID.
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
280
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
281 #ifdef HAVE_XINERAMA
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
282 if(XineramaIsActive(mDisplay))
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
283 {
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
284 XineramaScreenInfo *screens;
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
285 int num_screens;
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
286
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
287 screens = XineramaQueryScreens(mDisplay, &num_screens);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
288 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
289 if (! vo_screenwidth)
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
290 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
291 if (! vo_screenheight)
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
292 vo_screenheight=screens[xinerama_screen].height;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
293 xinerama_x = screens[xinerama_screen].x_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
294 xinerama_y = screens[xinerama_screen].y_org;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
295
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
296 XFree(screens);
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
297 }
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
298 else
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
299 #endif
4977
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
300 #ifdef HAVE_XF86VM
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
301 {
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
302 int clock;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
303 XF86VidModeGetModeLine( mDisplay,mScreen,&clock ,&modeline );
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
304 if ( !vo_screenwidth ) vo_screenwidth=modeline.hdisplay;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
305 if ( !vo_screenheight ) vo_screenheight=modeline.vdisplay;
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
306 }
7b65a4f0b74e vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents: 4974
diff changeset
307 #endif
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
308 {
2364
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
309 if (! vo_screenwidth)
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
310 vo_screenwidth=DisplayWidth( mDisplay,mScreen );
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
311 if (! vo_screenheight)
2f8f83ddbab3 -screenw/h patch by Tomi.Ollila@sonera.com
arpi
parents: 2149
diff changeset
312 vo_screenheight=DisplayHeight( mDisplay,mScreen );
2149
6358db6ad3d0 Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents: 1746
diff changeset
313 }
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
314 // get color depth (from root window, or the best visual):
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
315 XGetWindowAttributes(mDisplay, mRootWin, &attribs);
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
316 depth=attribs.depth;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
317
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
318 #ifdef SCAN_VISUALS
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
319 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
320 Visual *visual;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
321
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
322 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
323 if (depth != -1)
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
324 mXImage=XCreateImage(mDisplay, visual, depth, ZPixmap,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
325 0, NULL, 1, 1, 8, 1);
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
326 } else
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
327 #endif
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
328 mXImage=XGetImage( mDisplay,mRootWin,0,0,1,1,AllPlanes,ZPixmap );
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
329
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
330 vo_depthonscreen = depth; // display depth on screen
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
331
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
332 // get bits/pixel from XImage structure:
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
333 if (mXImage == NULL) {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
334 mask = 0;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
335 } else {
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
336 /*
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
337 * for the depth==24 case, the XImage structures might use
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
338 * 24 or 32 bits of data per pixel. The global variable
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
339 * vo_depthonscreen stores the amount of data per pixel in the
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
340 * XImage structure!
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
341 *
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
342 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp?
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
343 */
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
344 bpp=mXImage->bits_per_pixel;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
345 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
346 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
347 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
348 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
349 XDestroyImage( mXImage );
1732
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
350 }
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
351 if(((vo_depthonscreen+7)/8)==2){
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
352 if(mask==0x7FFF) vo_depthonscreen=15; else
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
353 if(mask==0xFFFF) vo_depthonscreen=16;
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
354 }
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 741
diff changeset
355 // XCloseDisplay( mDisplay );
1447
e82fbd67ae60 better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1415
diff changeset
356 /* 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
357 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
358 dispName += 4;
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
359 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
360 dispName += 9;
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
361 if (*dispName==':') mLocalDisplay=1; else mLocalDisplay=0;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
362 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
363 vo_screenwidth,vo_screenheight,
086e8d0c4639 Handle X11 displays with multiple depths.
jkeil
parents: 1723
diff changeset
364 depth, vo_depthonscreen,
4815
178b524e5213 Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents: 4812
diff changeset
365 dispName,mLocalDisplay?"local":"remote");
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
366
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5998
diff changeset
367 vo_wm_type=vo_wm_detect();
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
368
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
369 return 1;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
370 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
371
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
372 void vo_uninit( void )
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
373 {
6077
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
374 if (!mDisplay)
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
375 {
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
376 mp_msg(MSGT_VO, MSGL_V, "vo: x11 uninit called but X11 not inited..\n");
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
377 return;
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
378 }
754c2af16815 fixed vo_uninit
alex
parents: 6064
diff changeset
379 // if( !vo_depthonscreen ) return;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
380 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
381 XSetErrorHandler(NULL);
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
382 XCloseDisplay( mDisplay );
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6013
diff changeset
383 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
384 mDisplay=NULL;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
385 }
4436
0c2d2aaf9f86 added vo_x11_uninit
alex
parents: 4425
diff changeset
386
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
387 #include "../linux/keycodes.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
388 #include "wskeys.h"
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
389
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
390 extern void mplayer_put_key(int code);
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
391
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
392 void vo_x11_putkey(int key){
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
393 switch ( key )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
394 {
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
395 case wsLeft: mplayer_put_key(KEY_LEFT); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
396 case wsRight: mplayer_put_key(KEY_RIGHT); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
397 case wsUp: mplayer_put_key(KEY_UP); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
398 case wsDown: mplayer_put_key(KEY_DOWN); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
399 case wsSpace: mplayer_put_key(' '); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
400 case wsEscape: mplayer_put_key(KEY_ESC); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
401 case wsEnter: mplayer_put_key(KEY_ENTER); break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 614
diff changeset
402 case wsPageUp: mplayer_put_key(KEY_PAGE_UP); break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 614
diff changeset
403 case wsPageDown: mplayer_put_key(KEY_PAGE_DOWN); break;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
404 case wsq:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
405 case wsQ: mplayer_put_key('q'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
406 case wsp:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
407 case wsP: mplayer_put_key('p'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
408 case wsMinus:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
409 case wsGrayMinus: mplayer_put_key('-'); break;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
410 case wsPlus:
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
411 case wsGrayPlus: mplayer_put_key('+'); break;
464
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
412 case wsGrayMul:
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
413 case wsMul: mplayer_put_key('*'); break;
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
414 case wsGrayDiv:
edea605a4a5d add mixer support
pontscho
parents: 458
diff changeset
415 case wsDiv: mplayer_put_key('/'); break;
3490
d33dac3fcfa1 applied Panagiotis' patch
gabucino
parents: 3461
diff changeset
416 case wsLess: mplayer_put_key('<'); break;
d33dac3fcfa1 applied Panagiotis' patch
gabucino
parents: 3461
diff changeset
417 case wsMore: mplayer_put_key('>'); break;
516
bdca96b27ceb add 'mixer support
pontscho
parents: 464
diff changeset
418 case wsm:
bdca96b27ceb add 'mixer support
pontscho
parents: 464
diff changeset
419 case wsM: mplayer_put_key('m'); break;
655
0bdfd4dc95f2 add o key
pontscho
parents: 651
diff changeset
420 case wso:
0bdfd4dc95f2 add o key
pontscho
parents: 651
diff changeset
421 case wsO: mplayer_put_key('o'); break;
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1456
diff changeset
422 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
423 (key>='0' && key<='9')) mplayer_put_key(key);
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
424 }
369
b1a706452eeb pass keys a-z && A-Z
arpi_esp
parents: 326
diff changeset
425
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
426 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
427
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
428
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
429 // ----- Motif header: -------
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
430
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
431 #define MWM_HINTS_FUNCTIONS (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
432 #define MWM_HINTS_DECORATIONS (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
433 #define MWM_HINTS_INPUT_MODE (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
434 #define MWM_HINTS_STATUS (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
435
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
436 #define MWM_FUNC_ALL (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
437 #define MWM_FUNC_RESIZE (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
438 #define MWM_FUNC_MOVE (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
439 #define MWM_FUNC_MINIMIZE (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
440 #define MWM_FUNC_MAXIMIZE (1L << 4)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
441 #define MWM_FUNC_CLOSE (1L << 5)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
442
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
443 #define MWM_DECOR_ALL (1L << 0)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
444 #define MWM_DECOR_BORDER (1L << 1)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
445 #define MWM_DECOR_RESIZEH (1L << 2)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
446 #define MWM_DECOR_TITLE (1L << 3)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
447 #define MWM_DECOR_MENU (1L << 4)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
448 #define MWM_DECOR_MINIMIZE (1L << 5)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
449 #define MWM_DECOR_MAXIMIZE (1L << 6)
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
450
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
451 #define MWM_INPUT_MODELESS 0
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
452 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
453 #define MWM_INPUT_SYSTEM_MODAL 2
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
454 #define MWM_INPUT_FULL_APPLICATION_MODAL 3
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
455 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
456
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
457 #define MWM_TEAROFF_WINDOW (1L<<0)
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
458
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
459 typedef struct
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
460 {
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
461 long flags;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
462 long functions;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
463 long decorations;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
464 long input_mode;
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
465 long state;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
466 } MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
467
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
468 extern MotifWmHints vo_MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
469 extern Atom vo_MotifHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
470 extern int vo_depthonscreen;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
471 extern int vo_screenwidth;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
472 extern int vo_screenheight;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
473
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
474 static MotifWmHints vo_MotifWmHints;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
475 static Atom vo_MotifHints = None;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
476
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
477 // Note: always d==0 !
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
478 void vo_x11_decoration( Display * vo_Display,Window w,int d )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
479 {
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
480
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
481 if ( !WinID ) return;
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
482
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
483 if(vo_fsmode&1){
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
484 XSetWindowAttributes attr;
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5955
diff changeset
485 attr.override_redirect = (!d) ? True : False;
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
486 XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr);
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
487 // XMapWindow(vo_Display, w);
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
488 }
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
489
1415
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
490 if(vo_fsmode&8){
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
491 XSetTransientForHint (vo_Display, w, RootWindow(vo_Display,mScreen));
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
492 }
4d77492e5d67 new -fsmode flag: 0x8 enables XSetTransientForHint
arpi
parents: 1345
diff changeset
493
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
494 vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 );
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
495 if ( vo_MotifHints != None )
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
496 {
1236
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
497 memset( &vo_MotifWmHints,0,sizeof( MotifWmHints ) );
ebe9659da559 icewm basz bug fix
pontscho
parents: 1137
diff changeset
498 vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
499 if ( d )
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
500 {
6059
c0ae8c0eda72 fix Arpi's bugs
pontscho
parents: 6046
diff changeset
501 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
502 d=MWM_DECOR_ALL;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
503 }
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
504 #if 0
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
505 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
506 #else
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
507 vo_MotifWmHints.decorations=d|((vo_fsmode&2)?MWM_DECOR_MENU:0);
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
508 #endif
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
509 XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32,
1266
9e1b353f8171 switch fullscreen method with -fsmode
arpi
parents: 1236
diff changeset
510 PropModeReplace,(unsigned char *)&vo_MotifWmHints,(vo_fsmode&4)?4:5 );
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
511 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
512 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
513
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
514 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
515 XClassHint wmClass;
6401
15a6a5c78f35 Michele Balistreri <brain87@gmx.net>:
atmos4
parents: 6342
diff changeset
516 pid_t pid=getpid();
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
517 wmClass.res_name = name;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
518 wmClass.res_class = "MPlayer";
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
519 XSetClassHint(display,window,&wmClass);
6401
15a6a5c78f35 Michele Balistreri <brain87@gmx.net>:
atmos4
parents: 6342
diff changeset
520 XChangeProperty(display,window, XInternAtom(display,"_NET_WM_PID", False), 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
521 }
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
522
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
523 Window vo_window = None;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
524 GC vo_gc = NULL;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
525 XSizeHints vo_hint;
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
526
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
527 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
528 void vo_setwindow( Window w,GC g ) {
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1501
diff changeset
529 vo_window=w; vo_gc=g;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1732
diff changeset
530 }
723
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
531 #endif
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
532
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
533 void vo_x11_uninit()
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
534 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
535 if(vo_window!=None) vo_showcursor( mDisplay,vo_window );
4742
a34682347090 added local X11 error handler (call player_exit)
alex
parents: 4658
diff changeset
536
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
537 #ifdef HAVE_NEW_GUI
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
538 /* 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
539 if ( !use_gui )
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
540 #endif
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
541 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
542 if(vo_gc){
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
543 XSetBackground( mDisplay,vo_gc,0 );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
544 vo_gc=NULL;
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
545 }
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
546 if(vo_window!=None){
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
547 XClearWindow( mDisplay,vo_window );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
548 if (WinID < 0){
6179
c9ae6db39df0 Let X destroy the window
albeu
parents: 6164
diff changeset
549 XEvent xev;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
550 XUnmapWindow( mDisplay,vo_window );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
551 XDestroyWindow(mDisplay, vo_window);
6179
c9ae6db39df0 Let X destroy the window
albeu
parents: 6164
diff changeset
552 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
553 }
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
554 vo_window=None;
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
555 }
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 6009
diff changeset
556 vo_fs=0;
4437
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
557 }
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
558 }
f5fc7e9bac38 vo_x11_uninit: dont destroy window if GUI created it
alex
parents: 4436
diff changeset
559
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
560 int vo_mouse_timer_const = 30;
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
561 static int vo_mouse_counter = 30;
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
562
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
563 int vo_x11_check_events(Display *mydisplay){
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
564 int ret=0;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
565 XEvent Event;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
566 char buf[100];
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
567 KeySym keySym;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by Jrgen Keil <jk@tools.de>
arpi_esp
parents: 922
diff changeset
568 static XComposeStatus stat;
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
569
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
570 // unsigned long vo_KeyTable[512];
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
571
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
572 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
573
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
574 while ( XPending( mydisplay ) )
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
575 {
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
576 XNextEvent( mydisplay,&Event );
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
577 #ifdef HAVE_NEW_GUI
5061
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
578 if ( use_gui )
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
579 {
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
580 guiGetEvent( 0,(char*)&Event );
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
581 if ( vo_window != Event.xany.window ) continue;
40a97bdff44c small changes in event handling
pontscho
parents: 5057
diff changeset
582 }
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4795
diff changeset
583 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6089
diff changeset
584 // printf("\rEvent.type=%X \n",Event.type);
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
585 switch( Event.type )
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
586 {
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
587 case Expose:
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
588 ret|=VO_EVENT_EXPOSE;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
589 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
590 case ConfigureNotify:
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
591 vo_dwidth=Event.xconfigure.width;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
592 vo_dheight=Event.xconfigure.height;
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
593 #if 0
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
594 /* when resizing, x and y are zero :( */
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
595 vo_dx=Event.xconfigure.x;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
596 vo_dy=Event.xconfigure.y;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
597 #else
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
598 {
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
599 Window root;
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
600 int foo;
6140
44dcc49a0d80 64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents: 6111
diff changeset
601 Window win;
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
602 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo,
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
603 &foo/*width*/, &foo/*height*/, &foo, &foo);
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
604 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0,
6140
44dcc49a0d80 64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
arpi
parents: 6111
diff changeset
605 &vo_dx, &vo_dy, &win);
4812
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
606 }
bad436339b03 setting vo_dx and vo_dy in event handling
alex
parents: 4798
diff changeset
607 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
608 ret|=VO_EVENT_RESIZE;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
609 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
610 case KeyPress:
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
611 {
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
612 int key;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
613 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
614 key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
615 #ifdef HAVE_NEW_GUI
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
616 if ( ( use_gui )&&( key == wsEnter ) ) break;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
617 #endif
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
618 vo_x11_putkey( key );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
619 ret|=VO_EVENT_KEYPRESS;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4815
diff changeset
620 }
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
621 break;
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 5538
diff changeset
622 case MotionNotify:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
623 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
624 break;
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
625 #ifdef HAVE_NEW_INPUT
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
626 case ButtonPress:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
627 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
628 // 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
629 if(Event.xbutton.button > 3) {
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
630 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
631 break;
70031f0cc4d2 Bug fix in mouse button handling for 2 scroller (I hope it work
albeu
parents: 5651
diff changeset
632 }
5062
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
633 #ifdef HAVE_NEW_GUI
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
634 // Ignor mouse button 1 - 3 under gui
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
635 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break;
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
636 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
637 mplayer_put_key((MOUSE_BTN0+Event.xbutton.button-1)|MP_KEY_DOWN);
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
638 break;
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
639 case ButtonRelease:
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5919
diff changeset
640 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
641 #ifdef HAVE_NEW_GUI
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
642 // Ignor mouse button 1 - 3 under gui
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
643 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break;
90b692d38826 upsz ... 10l :)
pontscho
parents: 5061
diff changeset
644 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
645 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1);
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
646 break;
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4438
diff changeset
647 #endif
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
648 case PropertyNotify:
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
649 {
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
650 char * name = XGetAtomName( mydisplay,Event.xproperty.atom );
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
651 int wm = vo_wm_Unknown;
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
652
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
653 if ( !name ) break;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
654
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
655 wm=vo_wm_string_test(name);
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
656 if ( wm != vo_wm_Unknown ) vo_wm_type=wm;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
657
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
658 // 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
659
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
660 XFree( name );
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5835
diff changeset
661 }
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
662 break;
723
c3e0bdb64027 add gui support
pontscho
parents: 655
diff changeset
663 }
4795
b18e61cb457a small changes
pontscho
parents: 4742
diff changeset
664 }
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
665 return ret;
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
666 }
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
667
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
668 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
669 {
6046
b1a30f8d9955 remove base size from vo_x11_sizehint
pontscho
parents: 6043
diff changeset
670 vo_hint.flags=PPosition | PSize | PWinGravity;
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
671 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
672 if ( max )
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
673 {
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
674 vo_hint.max_width=width; vo_hint.max_height=height;
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
675 vo_hint.flags|=PMaxSize;
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
676 } 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
677 vo_hint.win_gravity=StaticGravity;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
678 XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
679 }
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
680
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
681 #define WIN_LAYER_ONBOTTOM 2
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
682 #define WIN_LAYER_NORMAL 4
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
683 #define WIN_LAYER_ONTOP 6
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
684
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
685 void vo_x11_setlayer( int layer )
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
686 {
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
687 Atom type;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
688 int format;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
689 unsigned long nitems, bytesafter;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
690 unsigned char * args = NULL;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
691
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
692 if ( WinID >= 0 ) return;
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
693
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
694 if ( vo_wm_type == vo_wm_IceWM )
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
695 {
6202
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
696 XClientMessageEvent xev;
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
697 memset(&xev, 0, sizeof(xev));
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
698 xev.type = ClientMessage;
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
699 xev.window = vo_window;
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
700 xev.message_type = XInternAtom(mDisplay, "_WIN_LAYER", False);
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
701 xev.format = 32;
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
702 xev.data.l[0] = layer?ice_layer:4; // if not fullscreen, stay on layer "Normal"
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
703 xev.data.l[1] = CurrentTime;
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
704 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] IceWM style stay on top ( layer %d ).\n",xev.data.l[0] );
1e275c6cabb2 new layer handling code under icewm from Attila
pontscho
parents: 6179
diff changeset
705 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, (XEvent *) &xev);
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
706 return;
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
707 }
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
708
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
709 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
6164
aee9c32349a9 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents: 6140
diff changeset
710 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
711 {
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
712 XEvent e;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
713
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
714 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ).\n",layer );
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
715 memset( &e,0,sizeof( e ) );
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
716 e.xclient.type=ClientMessage;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
717 e.xclient.message_type=XInternAtom( mDisplay,"_NET_WM_STATE",False );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
718 e.xclient.display=mDisplay;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
719 e.xclient.window=vo_window;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
720 e.xclient.format=32;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
721 e.xclient.data.l[0]=layer;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
722 e.xclient.data.l[1]=XInternAtom( mDisplay,"_NET_WM_STATE_STAYS_ON_TOP",False );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
723 XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,&e );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
724
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
725 XFree( args );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
726 return;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
727 }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
728 type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False );
6164
aee9c32349a9 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents: 6140
diff changeset
729 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
730 {
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
731 XClientMessageEvent xev;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
732
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
733 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Gnome style stay on top ( layer %d ).\n",layer );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
734 memset( &xev,0,sizeof( xev ) );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
735 xev.type=ClientMessage;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
736 xev.window=vo_window;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
737 xev.message_type=XInternAtom( mDisplay,"_WIN_LAYER",False );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
738 xev.format=32;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
739 switch ( layer )
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
740 {
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
741 case -1: xev.data.l[0] = WIN_LAYER_ONBOTTOM; break;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
742 case 0: xev.data.l[0] = WIN_LAYER_NORMAL; break;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
743 case 1: xev.data.l[0] = WIN_LAYER_ONTOP; break;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
744 }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
745 XSendEvent( mDisplay,mRootWin,False,SubstructureNotifyMask,(XEvent*)&xev );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
746 if ( layer ) XRaiseWindow( mDisplay,vo_window );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
747
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
748 XFree( args );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
749 return;
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
750 }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
751 }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
752
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
753 void vo_x11_fullscreen( void )
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
754 {
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
755 int x=0,y=0,w=vo_screenwidth,h=vo_screenheight;
5919
60cf2bca993f some bug fix
pontscho
parents: 5910
diff changeset
756
6034
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
757 if ( WinID >= 0 ) return;
7570f4666c15 fullscreen -- round three -- icewm fullscreen fixed
pontscho
parents: 6016
diff changeset
758
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
759 if ( vo_fs )
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
760 { vo_fs=VO_FALSE; x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height; }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
761 else { vo_fs=VO_TRUE; vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight; }
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
762
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6034
diff changeset
763 vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
764 vo_x11_sizehint( x,y,w,h,0 );
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
765 vo_x11_setlayer( vo_fs );
6064
55b2b5da9bd2 small cleanup, new flag in -fsmode to avoid unmapping window for unknown wm
arpi
parents: 6059
diff changeset
766 if(vo_wm_type==vo_wm_Unknown && !(vo_fsmode&16))
55b2b5da9bd2 small cleanup, new flag in -fsmode to avoid unmapping window for unknown wm
arpi
parents: 6059
diff changeset
767 XUnmapWindow( mDisplay,vo_window ); // required for MWM
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5981
diff changeset
768 XMoveResizeWindow( mDisplay,vo_window,x,y,w,h );
6342
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
769 #ifdef HAVE_XINERAMA
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
770 vo_x11_xinerama_move(mDisplay,vo_window);
40027495a6ed xinerama fullscreen switching fix by Joachim Breitner <mail@joachim-breitner.de>
attila
parents: 6303
diff changeset
771 #endif
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
772 XMapRaised( mDisplay,vo_window );
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
773 XRaiseWindow( mDisplay,vo_window );
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5658
diff changeset
774 XFlush( mDisplay );
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
775 }
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4977
diff changeset
776
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
777 void saver_on(Display *mDisplay) {
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
778
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
779 #ifdef HAVE_XDPMS
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
780 int nothing;
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
781 if (dpms_disabled)
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
782 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
783 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
784 {
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
785 if (!DPMSEnable(mDisplay)) { // restoring power saving settings
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
786 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
787 } else {
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
788 // 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
789 BOOL onoff;
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
790 CARD16 state;
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
791 DPMSInfo(mDisplay, &state, &onoff);
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
792 if (onoff) {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
793 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
794 } else {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
795 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
796 }
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
797 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
798 }
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
799 }
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
800 #endif
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
801
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
802 if (timeout_save)
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
803 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
804 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
805 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
806 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
807 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
808 }
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
809
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
810 if (xscreensaver_was_running && stop_xscreensaver)
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
811 system("xscreensaver -no-splash &");
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
812
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
813 }
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
814
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
815 void saver_off(Display *mDisplay) {
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
816
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
817 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
818 #ifdef HAVE_XDPMS
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
819 int nothing;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
820
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
821 if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
822 {
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
823 BOOL onoff;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
824 CARD16 state;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
825 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
826 if (onoff)
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
827 {
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
828 Status stat;
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
829 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
830 dpms_disabled=1;
741
00f97e760cbc DPMS re-enable patch by Loring Holden
arpi_esp
parents: 723
diff changeset
831 stat = DPMSDisable(mDisplay); // monitor powersave off
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
832 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
833 }
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
834 }
1345
be674b95b485 x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents: 1266
diff changeset
835 #endif
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
836 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
837 if (timeout_save)
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
838 XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6296
diff changeset
839 xscreensaver_was_running = stop_xscreensaver && ! system("xscreensaver-command -exit");
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 456
diff changeset
840 // turning off screensaver
326
f6b5c2dbc88e OSD alpha renderers moved to osd.c
arpi_esp
parents: 324
diff changeset
841 }
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
842
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
843
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
844
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
845 #ifdef HAVE_XINERAMA
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
846 void vo_x11_xinerama_move(Display *dsp, Window w)
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
847 {
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
848 if(XineramaIsActive(dsp))
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
849 {
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
850 /* 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
851 XMoveWindow(dsp,w,xinerama_x,xinerama_y);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
852 }
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
853 }
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 440
diff changeset
854 #endif
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
855
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
856 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
857 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
858 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
859 unsigned int vm_event, vm_error;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
860 unsigned int vm_ver, vm_rev;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
861 int i,j,have_vm=0;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
862
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
863 int modecount;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
864
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
865 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
866 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
867 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
868 have_vm=1;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
869 } else
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
870 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
871
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
872 if (have_vm) {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
873 if (vidmodes==NULL)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
874 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
875 j=0;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
876 *modeline_width=vidmodes[0]->hdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
877 *modeline_height=vidmodes[0]->vdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
878
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
879 for (i=1; i<modecount; i++)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
880 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y))
5538
70725449c947 VM Fix by Uwe.Reder@3soft.de
atmos4
parents: 5062
diff changeset
881 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
882 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
883 *modeline_width=vidmodes[i]->hdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
884 *modeline_height=vidmodes[i]->vdisplay;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
885 j=i;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
886 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
887
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
888 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
889 XF86VidModeLockModeSwitch(mDisplay,mScreen,0);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
890 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
891 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
892 X=(vo_screenwidth-*modeline_width)/2;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
893 Y=(vo_screenheight-*modeline_height)/2;
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
894 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
895 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
896 }
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
897
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
898 void vo_vm_close(Display *dpy)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
899 {
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
900 #ifdef HAVE_NEW_GUI
5019
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
901 if (vidmodes!=NULL && vo_window != None)
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
902 #else
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
903 if (vidmodes!=NULL)
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
904 #endif
5019
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
905 {
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
906 int i, modecount;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
907 int screen; screen=DefaultScreen( dpy );
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
908
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
909 free(vidmodes); vidmodes=NULL;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
910 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
911 for (i=0; i<modecount; i++)
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
912 if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight))
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
913 {
6296
74115095d9fe msg/i18n fixes and some printf->mp_msg
arpi
parents: 6202
diff changeset
914 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
915 break;
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
916 }
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
917
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
918 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
919 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
920 free(vidmodes);
95e573c1203f VM fixes by Nilmoni Deb.
atmos4
parents: 4993
diff changeset
921 }
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
922 }
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3954
diff changeset
923 #endif
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
924
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4181
diff changeset
925 #endif