annotate libvo/x11_common.c @ 6009:bb1f3552f118

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