annotate libvo/x11_common.c @ 5567:cfa4a2c0366e

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