Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 25613:f00333e3facf
Copy font data to ass_library instead of referencing demuxer-owned memory.
This fixes segfault when fonts are accessed after demuxer has been closed.
author | eugeni |
---|---|
date | Mon, 07 Jan 2008 14:02:06 +0000 |
parents | ca8190e97ac3 |
children | f689811209b1 |
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 | 2 #include <stdio.h> |
3 #include <stdlib.h> | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
4 #include <math.h> |
6401 | 5 #include <inttypes.h> |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
6 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
7 #include "config.h" |
5998 | 8 #include "mp_msg.h" |
22823
98eaf29b5dee
Code cleanup: don't include a .c file in mplayer.c and fix a few
rathann
parents:
21964
diff
changeset
|
9 #include "mp_fifo.h" |
6401 | 10 #include "x11_common.h" |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
11 |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
12 #ifdef X11_FULLSCREEN |
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
13 |
440
d19a3da6ac13
Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;)
gabucino
parents:
416
diff
changeset
|
14 #include <string.h> |
32 | 15 #include <unistd.h> |
9695 | 16 #include <signal.h> |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
17 #include <assert.h> |
32 | 18 |
19 #include "video_out.h" | |
10889 | 20 #include "aspect.h" |
12032
8cc4d4344c0f
Don't mess with the window position in xinerama when -geometry changes it.
diego
parents:
12031
diff
changeset
|
21 #include "geometry.h" |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
22 #include "help_mp.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
23 #include "osdep/timer.h" |
32 | 24 |
324 | 25 #include <X11/Xmd.h> |
32 | 26 #include <X11/Xlib.h> |
27 #include <X11/Xutil.h> | |
28 #include <X11/Xatom.h> | |
29 | |
25482 | 30 #ifdef HAVE_XSS |
31 #include <X11/extensions/scrnsaver.h> | |
32 #endif | |
33 | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
34 #ifdef HAVE_XDPMS |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
35 #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
|
36 #endif |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
37 |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
38 #ifdef HAVE_XINERAMA |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
39 #include <X11/extensions/Xinerama.h> |
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
40 #endif |
1732 | 41 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
42 #ifdef HAVE_XF86VM |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
43 #include <X11/extensions/xf86vmode.h> |
14636
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
44 #endif |
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
45 |
408bcfa575bf
Separate XF86 video mode extension check from XF86 keysym check as
diego
parents:
14244
diff
changeset
|
46 #ifdef HAVE_XF86XK |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
47 #include <X11/XF86keysym.h> |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
48 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
49 |
10359 | 50 #ifdef HAVE_XV |
51 #include <X11/extensions/Xv.h> | |
52 #include <X11/extensions/Xvlib.h> | |
14742 | 53 |
54 #include "subopt-helper.h" | |
10359 | 55 #endif |
56 | |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
57 #include "input/input.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
58 #include "input/mouse.h" |
4658 | 59 |
4798 | 60 #ifdef HAVE_NEW_GUI |
23077 | 61 #include "gui/interface.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
62 #include "mplayer.h" |
4798 | 63 #endif |
64 | |
8660
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
65 #define WIN_LAYER_ONBOTTOM 2 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
66 #define WIN_LAYER_NORMAL 4 |
39476cbd1673
I have looked at the fullscreen code and realized that there are
arpi
parents:
8653
diff
changeset
|
67 #define WIN_LAYER_ONTOP 6 |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
68 #define WIN_LAYER_ABOVE_DOCK 10 |
12582 | 69 |
19850
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
70 extern int enable_mouse_movements; |
12582 | 71 int fs_layer = WIN_LAYER_ABOVE_DOCK; |
72 static int orig_layer = 0; | |
12111
8e31aacc3e81
- win_gravity memorizing and restoring while switching fullscreen mode (by Adam Tla/lka)
rathann
parents:
12096
diff
changeset
|
73 static int old_gravity = NorthWestGravity; |
8866 | 74 |
12582 | 75 int stop_xscreensaver = 0; |
6202 | 76 |
12582 | 77 static int dpms_disabled = 0; |
324 | 78 |
12582 | 79 char *mDisplayName = NULL; |
80 Display *mDisplay = NULL; | |
81 Window mRootWin; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
82 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
|
83 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
|
84 |
3830 | 85 /* output window id */ |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
86 int vo_mouse_autohide = 0; |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
87 int vo_wm_type = 0; |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
88 int vo_fs_type = 0; // needs to be accessible for GUI X11 code |
12125
f4fc74a88e65
full screen flipping synchronization corrections (by Adam Tla/lka)
rathann
parents:
12123
diff
changeset
|
89 static int vo_fs_flip = 0; |
12582 | 90 char **vo_fstype_list; |
384 | 91 |
21938 | 92 /* 1 means that the WM is metacity (broken as hell) */ |
8835
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
93 int metacity_hack = 0; |
664b0612f950
Fixed metacity + xv behavior (something broke it lately).
filon
parents:
8783
diff
changeset
|
94 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
95 static Atom XA_NET_SUPPORTED; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
96 static Atom XA_NET_WM_STATE; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
97 static Atom XA_NET_WM_STATE_FULLSCREEN; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
98 static Atom XA_NET_WM_STATE_ABOVE; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
99 static Atom XA_NET_WM_STATE_STAYS_ON_TOP; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
100 static Atom XA_NET_WM_STATE_BELOW; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
101 static Atom XA_NET_WM_PID; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
102 static Atom XA_WIN_PROTOCOLS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
103 static Atom XA_WIN_LAYER; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
104 static Atom XA_WIN_HINTS; |
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
105 static Atom XA_BLACKBOX_PID; |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
106 static Atom XAWM_PROTOCOLS; |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
107 static Atom XAWM_DELETE_WINDOW; |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
108 |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
109 #define XA_INIT(x) XA##x = XInternAtom(mDisplay, #x, False) |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
110 |
7435 | 111 static int vo_old_x = 0; |
112 static int vo_old_y = 0; | |
113 static int vo_old_width = 0; | |
114 static int vo_old_height = 0; | |
115 | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
116 #ifdef HAVE_XF86VM |
12582 | 117 XF86VidModeModeInfo **vidmodes = NULL; |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
118 XF86VidModeModeLine modeline; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
119 #endif |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
120 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
121 static int vo_x11_get_fs_type(int supported); |
10212
d358fa9a1068
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10193
diff
changeset
|
122 |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
123 |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
124 /* |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
125 * Sends the EWMH fullscreen state event. |
21938 | 126 * |
127 * action: could be one of _NET_WM_STATE_REMOVE -- remove state | |
128 * _NET_WM_STATE_ADD -- add state | |
129 * _NET_WM_STATE_TOGGLE -- toggle | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
130 */ |
12582 | 131 void vo_x11_ewmh_fullscreen(int action) |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
132 { |
12582 | 133 assert(action == _NET_WM_STATE_REMOVE || |
134 action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE); | |
135 | |
136 if (vo_fs_type & vo_wm_FULLSCREEN) | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
137 { |
12582 | 138 XEvent xev; |
139 | |
21938 | 140 /* init X event structure for _NET_WM_FULLSCREEN client message */ |
12582 | 141 xev.xclient.type = ClientMessage; |
142 xev.xclient.serial = 0; | |
143 xev.xclient.send_event = True; | |
144 xev.xclient.message_type = XInternAtom(mDisplay, | |
145 "_NET_WM_STATE", False); | |
146 xev.xclient.window = vo_window; | |
147 xev.xclient.format = 32; | |
148 xev.xclient.data.l[0] = action; | |
149 xev.xclient.data.l[1] = XInternAtom(mDisplay, | |
150 "_NET_WM_STATE_FULLSCREEN", | |
151 False); | |
152 xev.xclient.data.l[2] = 0; | |
153 xev.xclient.data.l[3] = 0; | |
154 xev.xclient.data.l[4] = 0; | |
155 | |
156 /* finally send that damn thing */ | |
157 if (!XSendEvent(mDisplay, DefaultRootWindow(mDisplay), False, | |
158 SubstructureRedirectMask | SubstructureNotifyMask, | |
159 &xev)) | |
160 { | |
161 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_EwmhFullscreenStateFailed); | |
162 } | |
12520
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
163 } |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
164 } |
94e66acdb706
Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents:
12371
diff
changeset
|
165 |
12582 | 166 void vo_hidecursor(Display * disp, Window win) |
384 | 167 { |
12582 | 168 Cursor no_ptr; |
169 Pixmap bm_no; | |
170 XColor black, dummy; | |
171 Colormap colormap; | |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
172 static char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; |
3954 | 173 |
12582 | 174 if (WinID == 0) |
21938 | 175 return; // do not hide if playing on the root window |
12582 | 176 |
177 colormap = DefaultColormap(disp, DefaultScreen(disp)); | |
14743
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
178 if ( !XAllocNamedColor(disp, colormap, "black", &black, &dummy) ) |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
179 { |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
180 return; // color alloc failed, give up |
465c8617cbe5
We should not crash, only because we couldn't hide the cursor.
al
parents:
14742
diff
changeset
|
181 } |
12582 | 182 bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8); |
183 no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0); | |
184 XDefineCursor(disp, win, no_ptr); | |
185 XFreeCursor(disp, no_ptr); | |
186 if (bm_no != None) | |
187 XFreePixmap(disp, bm_no); | |
13953 | 188 XFreeColors(disp,colormap,&black.pixel,1,0); |
384 | 189 } |
190 | |
12582 | 191 void vo_showcursor(Display * disp, Window win) |
192 { | |
193 if (WinID == 0) | |
194 return; | |
195 XDefineCursor(disp, win, 0); | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
196 } |
384 | 197 |
12582 | 198 static int x11_errorhandler(Display * display, XErrorEvent * event) |
4742 | 199 { |
200 #define MSGLEN 60 | |
201 char msg[MSGLEN]; | |
12582 | 202 |
203 XGetErrorText(display, event->error_code, (char *) &msg, MSGLEN); | |
204 | |
205 mp_msg(MSGT_VO, MSGL_ERR, "X11 error: %s\n", msg); | |
206 | |
207 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 208 "Type: %x, display: %p, resourceid: %lx, serial: %lx\n", |
12582 | 209 event->type, event->display, event->resourceid, event->serial); |
210 mp_msg(MSGT_VO, MSGL_V, | |
211 "Error code: %x, request code: %x, minor code: %x\n", | |
212 event->error_code, event->request_code, event->minor_code); | |
213 | |
21808
eaf6ed9cb5ab
Do not abort on X11 errors, most are not at all fatal.
reimar
parents:
21623
diff
changeset
|
214 // abort(); |
6095 | 215 //exit_player("X11 error"); |
23615 | 216 return 0; |
4742 | 217 #undef MSGLEN |
218 } | |
1732 | 219 |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
220 void fstype_help(void) |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
221 { |
12582 | 222 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType); |
18237
4231482179b6
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents:
18160
diff
changeset
|
223 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n"); |
12582 | 224 |
225 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none", | |
226 "don't set fullscreen window layer"); | |
227 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer", | |
228 "use _WIN_LAYER hint with default layer"); | |
229 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer=<0..15>", | |
230 "use _WIN_LAYER hint with a given layer number"); | |
231 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "netwm", | |
232 "force NETWM style"); | |
233 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "above", | |
234 "use _NETWM_STATE_ABOVE hint if available"); | |
235 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below", | |
236 "use _NETWM_STATE_BELOW hint if available"); | |
237 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen", | |
238 "use _NETWM_STATE_FULLSCREEN hint if availale"); | |
239 mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top", | |
240 "use _NETWM_STATE_STAYS_ON_TOP hint if available"); | |
241 mp_msg(MSGT_VO, MSGL_INFO, | |
242 "You can also negate the settings with simply putting '-' in the beginning"); | |
17727
096cb1dfb591
Make -xy help output consistent, output an empty line before and after.
diego
parents:
17566
diff
changeset
|
243 mp_msg(MSGT_VO, MSGL_INFO, "\n"); |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
244 } |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
245 |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
246 static void fstype_dump(int fstype) |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
247 { |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
248 if (fstype) |
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
249 { |
12582 | 250 mp_msg(MSGT_VO, MSGL_V, "[x11] Current fstype setting honours"); |
251 if (fstype & vo_wm_LAYER) | |
252 mp_msg(MSGT_VO, MSGL_V, " LAYER"); | |
253 if (fstype & vo_wm_FULLSCREEN) | |
254 mp_msg(MSGT_VO, MSGL_V, " FULLSCREEN"); | |
255 if (fstype & vo_wm_STAYS_ON_TOP) | |
256 mp_msg(MSGT_VO, MSGL_V, " STAYS_ON_TOP"); | |
257 if (fstype & vo_wm_ABOVE) | |
258 mp_msg(MSGT_VO, MSGL_V, " ABOVE"); | |
259 if (fstype & vo_wm_BELOW) | |
260 mp_msg(MSGT_VO, MSGL_V, " BELOW"); | |
261 mp_msg(MSGT_VO, MSGL_V, " X atoms\n"); | |
262 } else | |
263 mp_msg(MSGT_VO, MSGL_V, | |
264 "[x11] Current fstype setting doesn't honour any X atoms\n"); | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
265 } |
12582 | 266 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
267 static int net_wm_support_state_test(Atom atom) |
8653 | 268 { |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
269 #define NET_WM_STATE_TEST(x) { if (atom == XA_NET_WM_STATE_##x) { mp_msg( MSGT_VO,MSGL_V, "[x11] Detected wm supports " #x " state.\n" ); return vo_wm_##x; } } |
12582 | 270 |
271 NET_WM_STATE_TEST(FULLSCREEN); | |
272 NET_WM_STATE_TEST(ABOVE); | |
273 NET_WM_STATE_TEST(STAYS_ON_TOP); | |
274 NET_WM_STATE_TEST(BELOW); | |
275 return 0; | |
8653 | 276 } |
277 | |
12582 | 278 static int x11_get_property(Atom type, Atom ** args, unsigned long *nitems) |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
279 { |
12582 | 280 int format; |
281 unsigned long bytesafter; | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
282 |
12582 | 283 return (Success == |
284 XGetWindowProperty(mDisplay, mRootWin, type, 0, 16384, False, | |
285 AnyPropertyType, &type, &format, nitems, | |
286 &bytesafter, (unsigned char **) args) | |
287 && *nitems > 0); | |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
288 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
289 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
290 static int vo_wm_detect(void) |
6009 | 291 { |
12582 | 292 int i; |
293 int wm = 0; | |
294 unsigned long nitems; | |
295 Atom *args = NULL; | |
296 | |
297 if (WinID >= 0) | |
298 return 0; | |
299 | |
8669
fd398a0b4b3b
This time the patch is fixing much more that breaking :-)
arpi
parents:
8663
diff
changeset
|
300 // -- supports layers |
12582 | 301 if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems)) |
302 { | |
303 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports layers.\n"); | |
304 for (i = 0; i < nitems; i++) | |
305 { | |
306 if (args[i] == XA_WIN_LAYER) | |
307 { | |
308 wm |= vo_wm_LAYER; | |
309 metacity_hack |= 1; | |
310 } else | |
21938 | 311 /* metacity is the only window manager I know which reports |
312 * supporting only the _WIN_LAYER hint in _WIN_PROTOCOLS. | |
313 * (what's more support for it is broken) */ | |
12582 | 314 metacity_hack |= 2; |
315 } | |
316 XFree(args); | |
317 if (wm && (metacity_hack == 1)) | |
318 { | |
21938 | 319 // metacity claims to support layers, but it is not the truth :-) |
12582 | 320 wm ^= vo_wm_LAYER; |
321 mp_msg(MSGT_VO, MSGL_V, | |
322 "[x11] Using workaround for Metacity bugs.\n"); | |
323 } | |
324 } | |
6009 | 325 // --- netwm |
12582 | 326 if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems)) |
327 { | |
328 mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports NetWM.\n"); | |
329 for (i = 0; i < nitems; i++) | |
330 wm |= net_wm_support_state_test(args[i]); | |
331 XFree(args); | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
332 #if 0 |
12582 | 333 // ugly hack for broken OpenBox _NET_WM_STATE_FULLSCREEN support |
21938 | 334 // (in their implementation it only changes internal window state, nothing more!!!) |
12582 | 335 if (wm & vo_wm_FULLSCREEN) |
336 { | |
337 if (x11_get_property(XA_BLACKBOX_PID, &args, &nitems)) | |
338 { | |
339 mp_msg(MSGT_VO, MSGL_V, | |
340 "[x11] Detected wm is a broken OpenBox.\n"); | |
341 wm ^= vo_wm_FULLSCREEN; | |
342 } | |
343 XFree(args); | |
344 } | |
10695
879ce4016b34
Commit alex's fstype patch x11_common.c3.diff with additional manpage extension.
attila
parents:
10587
diff
changeset
|
345 #endif |
12582 | 346 } |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
347 |
12582 | 348 if (wm == 0) |
349 mp_msg(MSGT_VO, MSGL_V, "[x11] Unknown wm type...\n"); | |
350 return wm; | |
351 } | |
6009 | 352 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
353 static void init_atoms(void) |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
354 { |
12582 | 355 XA_INIT(_NET_SUPPORTED); |
356 XA_INIT(_NET_WM_STATE); | |
357 XA_INIT(_NET_WM_STATE_FULLSCREEN); | |
358 XA_INIT(_NET_WM_STATE_ABOVE); | |
359 XA_INIT(_NET_WM_STATE_STAYS_ON_TOP); | |
360 XA_INIT(_NET_WM_STATE_BELOW); | |
361 XA_INIT(_NET_WM_PID); | |
362 XA_INIT(_WIN_PROTOCOLS); | |
363 XA_INIT(_WIN_LAYER); | |
364 XA_INIT(_WIN_HINTS); | |
365 XA_INIT(_BLACKBOX_PID); | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
366 XA_INIT(WM_PROTOCOLS); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
367 XA_INIT(WM_DELETE_WINDOW); |
8742
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
368 } |
241f40ef5e28
More fullscreen cleanup work. Use nice macros for X atoms.
filon
parents:
8716
diff
changeset
|
369 |
18116 | 370 void update_xinerama_info(void) { |
371 int screen = xinerama_screen; | |
372 xinerama_x = xinerama_y = 0; | |
373 #ifdef HAVE_XINERAMA | |
374 if (screen >= -1 && XineramaIsActive(mDisplay)) | |
375 { | |
376 XineramaScreenInfo *screens; | |
377 int num_screens; | |
378 | |
379 screens = XineramaQueryScreens(mDisplay, &num_screens); | |
380 if (screen >= num_screens) | |
381 screen = num_screens - 1; | |
382 if (screen == -1) { | |
383 int x = vo_dx + vo_dwidth / 2; | |
384 int y = vo_dy + vo_dheight / 2; | |
385 for (screen = num_screens - 1; screen > 0; screen--) { | |
386 int left = screens[screen].x_org; | |
387 int right = left + screens[screen].width; | |
388 int top = screens[screen].y_org; | |
389 int bottom = top + screens[screen].height; | |
390 if (left <= x && x <= right && top <= y && y <= bottom) | |
391 break; | |
392 } | |
393 } | |
394 if (screen < 0) | |
395 screen = 0; | |
396 vo_screenwidth = screens[screen].width; | |
397 vo_screenheight = screens[screen].height; | |
398 xinerama_x = screens[screen].x_org; | |
399 xinerama_y = screens[screen].y_org; | |
400 | |
401 XFree(screens); | |
402 } | |
18160
03bc3385a845
10l, aspect_save_screenres must be always called in update_xinerama_info.
reimar
parents:
18149
diff
changeset
|
403 #endif |
18116 | 404 aspect_save_screenres(vo_screenwidth, vo_screenheight); |
405 } | |
406 | |
12582 | 407 int vo_init(void) |
32 | 408 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
409 // int mScreen; |
12582 | 410 int depth, bpp; |
411 unsigned int mask; | |
412 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
413 // 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
|
414 // Display * mDisplay; |
12582 | 415 XImage *mXImage = NULL; |
416 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
417 // Window mRootWin; |
12582 | 418 XWindowAttributes attribs; |
419 char *dispName; | |
12972
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
420 |
c8900eba2cc7
now use vo_rootwin var to check for -rootwin switch
nplourde
parents:
12798
diff
changeset
|
421 if (vo_rootwin) |
21938 | 422 WinID = 0; // use root window |
32 | 423 |
12582 | 424 if (vo_depthonscreen) |
13935 | 425 { |
426 saver_off(mDisplay); | |
12582 | 427 return 1; // already called |
13935 | 428 } |
32 | 429 |
12582 | 430 XSetErrorHandler(x11_errorhandler); |
4812 | 431 |
432 #if 0 | |
12582 | 433 if (!mDisplayName) |
434 if (!(mDisplayName = getenv("DISPLAY"))) | |
435 mDisplayName = strdup(":0.0"); | |
4812 | 436 #else |
12582 | 437 dispName = XDisplayName(mDisplayName); |
4812 | 438 #endif |
439 | |
12582 | 440 mp_msg(MSGT_VO, MSGL_V, "X11 opening display: %s\n", dispName); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
441 |
12582 | 442 mDisplay = XOpenDisplay(dispName); |
443 if (!mDisplay) | |
444 { | |
445 mp_msg(MSGT_VO, MSGL_ERR, | |
446 "vo: couldn't open the X11 display (%s)!\n", dispName); | |
447 return 0; | |
448 } | |
21938 | 449 mScreen = DefaultScreen(mDisplay); // screen ID |
450 mRootWin = RootWindow(mDisplay, mScreen); // root window ID | |
2149
6358db6ad3d0
Xinerama screen size fix by Lev Babiev <harley@hosers.org>
arpi
parents:
1746
diff
changeset
|
451 |
12582 | 452 init_atoms(); |
453 | |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
454 #ifdef HAVE_XF86VM |
12582 | 455 { |
456 int clock; | |
457 | |
458 XF86VidModeGetModeLine(mDisplay, mScreen, &clock, &modeline); | |
459 if (!vo_screenwidth) | |
460 vo_screenwidth = modeline.hdisplay; | |
461 if (!vo_screenheight) | |
462 vo_screenheight = modeline.vdisplay; | |
463 } | |
4977
7b65a4f0b74e
vm pecs applied from daniel carter <hedonist@win.co.nz>
pontscho
parents:
4974
diff
changeset
|
464 #endif |
12582 | 465 { |
466 if (!vo_screenwidth) | |
467 vo_screenwidth = DisplayWidth(mDisplay, mScreen); | |
468 if (!vo_screenheight) | |
469 vo_screenheight = DisplayHeight(mDisplay, mScreen); | |
470 } | |
471 // get color depth (from root window, or the best visual): | |
472 XGetWindowAttributes(mDisplay, mRootWin, &attribs); | |
473 depth = attribs.depth; | |
1732 | 474 |
12582 | 475 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) |
476 { | |
477 Visual *visual; | |
478 | |
479 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); | |
480 if (depth != -1) | |
481 mXImage = XCreateImage(mDisplay, visual, depth, ZPixmap, | |
482 0, NULL, 1, 1, 8, 1); | |
483 } else | |
484 mXImage = | |
485 XGetImage(mDisplay, mRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap); | |
1732 | 486 |
12582 | 487 vo_depthonscreen = depth; // display depth on screen |
1732 | 488 |
12582 | 489 // get bits/pixel from XImage structure: |
490 if (mXImage == NULL) | |
491 { | |
492 mask = 0; | |
493 } else | |
494 { | |
495 /* | |
496 * for the depth==24 case, the XImage structures might use | |
497 * 24 or 32 bits of data per pixel. The global variable | |
498 * vo_depthonscreen stores the amount of data per pixel in the | |
499 * XImage structure! | |
500 * | |
501 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp? | |
502 */ | |
503 bpp = mXImage->bits_per_pixel; | |
504 if ((vo_depthonscreen + 7) / 8 != (bpp + 7) / 8) | |
505 vo_depthonscreen = bpp; // by A'rpi | |
506 mask = | |
507 mXImage->red_mask | mXImage->green_mask | mXImage->blue_mask; | |
508 mp_msg(MSGT_VO, MSGL_V, | |
509 "vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", mask, | |
510 mXImage->red_mask, mXImage->green_mask, mXImage->blue_mask); | |
511 XDestroyImage(mXImage); | |
512 } | |
513 if (((vo_depthonscreen + 7) / 8) == 2) | |
514 { | |
515 if (mask == 0x7FFF) | |
516 vo_depthonscreen = 15; | |
517 else if (mask == 0xFFFF) | |
518 vo_depthonscreen = 16; | |
519 } | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
741
diff
changeset
|
520 // XCloseDisplay( mDisplay ); |
1447
e82fbd67ae60
better local display connection patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents:
1415
diff
changeset
|
521 /* slightly improved local display detection AST */ |
12582 | 522 if (strncmp(dispName, "unix:", 5) == 0) |
523 dispName += 4; | |
524 else if (strncmp(dispName, "localhost:", 10) == 0) | |
525 dispName += 9; | |
526 if (*dispName == ':' && atoi(dispName + 1) < 10) | |
527 mLocalDisplay = 1; | |
528 else | |
529 mLocalDisplay = 0; | |
16301 | 530 mp_msg(MSGT_VO, MSGL_V, |
12582 | 531 "vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n", |
532 vo_screenwidth, vo_screenheight, depth, vo_depthonscreen, | |
533 dispName, mLocalDisplay ? "local" : "remote"); | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
534 |
12582 | 535 vo_wm_type = vo_wm_detect(); |
536 | |
537 vo_fs_type = vo_x11_get_fs_type(vo_wm_type); | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
538 |
12582 | 539 fstype_dump(vo_fs_type); |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
540 |
12582 | 541 saver_off(mDisplay); |
542 return 1; | |
32 | 543 } |
544 | |
12582 | 545 void vo_uninit(void) |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
546 { |
12582 | 547 if (!mDisplay) |
548 { | |
549 mp_msg(MSGT_VO, MSGL_V, | |
550 "vo: x11 uninit called but X11 not inited..\n"); | |
551 return; | |
552 } | |
6077 | 553 // if( !vo_depthonscreen ) return; |
12582 | 554 mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n"); |
555 XSetErrorHandler(NULL); | |
556 XCloseDisplay(mDisplay); | |
557 vo_depthonscreen = 0; | |
558 mDisplay = NULL; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
6009
diff
changeset
|
559 } |
4436 | 560 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12972
diff
changeset
|
561 #include "osdep/keycodes.h" |
32 | 562 #include "wskeys.h" |
563 | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
564 #ifdef XF86XK_AudioPause |
18950 | 565 static void vo_x11_putkey_ext(int keysym) |
12582 | 566 { |
567 switch (keysym) | |
568 { | |
569 case XF86XK_AudioPause: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
570 mplayer_put_key(KEY_PAUSE); |
12582 | 571 break; |
572 case XF86XK_AudioStop: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
573 mplayer_put_key(KEY_STOP); |
12582 | 574 break; |
575 case XF86XK_AudioPrev: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
576 mplayer_put_key(KEY_PREV); |
12582 | 577 break; |
578 case XF86XK_AudioNext: | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
579 mplayer_put_key(KEY_NEXT); |
12582 | 580 break; |
24323
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
581 case XF86XK_AudioLowerVolume: |
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
582 mplayer_put_key(KEY_VOLUME_DOWN); |
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
583 break; |
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
584 case XF86XK_AudioRaiseVolume: |
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
585 mplayer_put_key(KEY_VOLUME_UP); |
ddd7774aa043
Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
diego
parents:
24313
diff
changeset
|
586 break; |
12582 | 587 default: |
588 break; | |
589 } | |
9822
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
590 } |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
591 #endif |
1e761763566c
Support for "internet" or "multimedia" keyboards in X11.
albeu
parents:
9695
diff
changeset
|
592 |
12582 | 593 void vo_x11_putkey(int key) |
594 { | |
595 switch (key) | |
596 { | |
597 case wsLeft: | |
598 mplayer_put_key(KEY_LEFT); | |
599 break; | |
600 case wsRight: | |
601 mplayer_put_key(KEY_RIGHT); | |
602 break; | |
603 case wsUp: | |
604 mplayer_put_key(KEY_UP); | |
605 break; | |
606 case wsDown: | |
607 mplayer_put_key(KEY_DOWN); | |
608 break; | |
609 case wsSpace: | |
610 mplayer_put_key(' '); | |
611 break; | |
612 case wsEscape: | |
613 mplayer_put_key(KEY_ESC); | |
614 break; | |
16892
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
615 case wsTab: |
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
616 mplayer_put_key(KEY_TAB); |
3470c810527b
libvo input cleanup: remove the dependency on libinput,
albeu
parents:
16793
diff
changeset
|
617 break; |
12582 | 618 case wsEnter: |
619 mplayer_put_key(KEY_ENTER); | |
620 break; | |
621 case wsBackSpace: | |
622 mplayer_put_key(KEY_BS); | |
623 break; | |
624 case wsDelete: | |
625 mplayer_put_key(KEY_DELETE); | |
626 break; | |
627 case wsInsert: | |
628 mplayer_put_key(KEY_INSERT); | |
629 break; | |
630 case wsHome: | |
631 mplayer_put_key(KEY_HOME); | |
632 break; | |
633 case wsEnd: | |
634 mplayer_put_key(KEY_END); | |
635 break; | |
636 case wsPageUp: | |
637 mplayer_put_key(KEY_PAGE_UP); | |
638 break; | |
639 case wsPageDown: | |
640 mplayer_put_key(KEY_PAGE_DOWN); | |
641 break; | |
642 case wsF1: | |
643 mplayer_put_key(KEY_F + 1); | |
644 break; | |
645 case wsF2: | |
646 mplayer_put_key(KEY_F + 2); | |
647 break; | |
648 case wsF3: | |
649 mplayer_put_key(KEY_F + 3); | |
650 break; | |
651 case wsF4: | |
652 mplayer_put_key(KEY_F + 4); | |
653 break; | |
654 case wsF5: | |
655 mplayer_put_key(KEY_F + 5); | |
656 break; | |
657 case wsF6: | |
658 mplayer_put_key(KEY_F + 6); | |
659 break; | |
660 case wsF7: | |
661 mplayer_put_key(KEY_F + 7); | |
662 break; | |
663 case wsF8: | |
664 mplayer_put_key(KEY_F + 8); | |
665 break; | |
666 case wsF9: | |
667 mplayer_put_key(KEY_F + 9); | |
668 break; | |
669 case wsF10: | |
670 mplayer_put_key(KEY_F + 10); | |
671 break; | |
672 case wsF11: | |
673 mplayer_put_key(KEY_F + 11); | |
674 break; | |
675 case wsF12: | |
676 mplayer_put_key(KEY_F + 12); | |
677 break; | |
678 case wsMinus: | |
679 case wsGrayMinus: | |
680 mplayer_put_key('-'); | |
681 break; | |
682 case wsPlus: | |
683 case wsGrayPlus: | |
684 mplayer_put_key('+'); | |
685 break; | |
686 case wsGrayMul: | |
687 case wsMul: | |
688 mplayer_put_key('*'); | |
689 break; | |
690 case wsGrayDiv: | |
691 case wsDiv: | |
692 mplayer_put_key('/'); | |
693 break; | |
694 case wsLess: | |
695 mplayer_put_key('<'); | |
696 break; | |
697 case wsMore: | |
698 mplayer_put_key('>'); | |
699 break; | |
700 case wsGray0: | |
701 mplayer_put_key(KEY_KP0); | |
702 break; | |
703 case wsGrayEnd: | |
704 case wsGray1: | |
705 mplayer_put_key(KEY_KP1); | |
706 break; | |
707 case wsGrayDown: | |
708 case wsGray2: | |
709 mplayer_put_key(KEY_KP2); | |
710 break; | |
711 case wsGrayPgDn: | |
712 case wsGray3: | |
713 mplayer_put_key(KEY_KP3); | |
714 break; | |
715 case wsGrayLeft: | |
716 case wsGray4: | |
717 mplayer_put_key(KEY_KP4); | |
718 break; | |
719 case wsGray5Dup: | |
720 case wsGray5: | |
721 mplayer_put_key(KEY_KP5); | |
722 break; | |
723 case wsGrayRight: | |
724 case wsGray6: | |
725 mplayer_put_key(KEY_KP6); | |
726 break; | |
727 case wsGrayHome: | |
728 case wsGray7: | |
729 mplayer_put_key(KEY_KP7); | |
730 break; | |
731 case wsGrayUp: | |
732 case wsGray8: | |
733 mplayer_put_key(KEY_KP8); | |
734 break; | |
735 case wsGrayPgUp: | |
736 case wsGray9: | |
737 mplayer_put_key(KEY_KP9); | |
738 break; | |
739 case wsGrayDecimal: | |
740 mplayer_put_key(KEY_KPDEC); | |
741 break; | |
742 case wsGrayInsert: | |
743 mplayer_put_key(KEY_KPINS); | |
744 break; | |
745 case wsGrayDelete: | |
746 mplayer_put_key(KEY_KPDEL); | |
747 break; | |
748 case wsGrayEnter: | |
749 mplayer_put_key(KEY_KPENTER); | |
750 break; | |
751 case wsGrave: | |
752 mplayer_put_key('`'); | |
753 break; | |
754 case wsTilde: | |
755 mplayer_put_key('~'); | |
756 break; | |
757 case wsExclSign: | |
758 mplayer_put_key('!'); | |
759 break; | |
760 case wsAt: | |
761 mplayer_put_key('@'); | |
762 break; | |
763 case wsHash: | |
764 mplayer_put_key('#'); | |
765 break; | |
766 case wsDollar: | |
767 mplayer_put_key('$'); | |
768 break; | |
769 case wsPercent: | |
770 mplayer_put_key('%'); | |
771 break; | |
772 case wsCircumflex: | |
773 mplayer_put_key('^'); | |
774 break; | |
775 case wsAmpersand: | |
776 mplayer_put_key('&'); | |
777 break; | |
778 case wsobracket: | |
779 mplayer_put_key('('); | |
780 break; | |
781 case wscbracket: | |
782 mplayer_put_key(')'); | |
783 break; | |
784 case wsUnder: | |
785 mplayer_put_key('_'); | |
786 break; | |
787 case wsocbracket: | |
788 mplayer_put_key('{'); | |
789 break; | |
790 case wsccbracket: | |
791 mplayer_put_key('}'); | |
792 break; | |
793 case wsColon: | |
794 mplayer_put_key(':'); | |
795 break; | |
796 case wsSemicolon: | |
797 mplayer_put_key(';'); | |
798 break; | |
799 case wsDblQuote: | |
800 mplayer_put_key('\"'); | |
801 break; | |
802 case wsAcute: | |
803 mplayer_put_key('\''); | |
804 break; | |
805 case wsComma: | |
806 mplayer_put_key(','); | |
807 break; | |
808 case wsPoint: | |
809 mplayer_put_key('.'); | |
810 break; | |
811 case wsQuestSign: | |
812 mplayer_put_key('?'); | |
813 break; | |
814 case wsBSlash: | |
815 mplayer_put_key('\\'); | |
816 break; | |
817 case wsPipe: | |
818 mplayer_put_key('|'); | |
819 break; | |
820 case wsEqual: | |
821 mplayer_put_key('='); | |
822 break; | |
823 case wsosbrackets: | |
824 mplayer_put_key('['); | |
825 break; | |
826 case wscsbrackets: | |
827 mplayer_put_key(']'); | |
828 break; | |
10936
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
829 |
51bc09f2977c
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
lumag
parents:
10920
diff
changeset
|
830 |
12582 | 831 default: |
832 if ((key >= 'a' && key <= 'z') || (key >= 'A' && key <= 'Z') || | |
833 (key >= '0' && key <= '9')) | |
834 mplayer_put_key(key); | |
835 } | |
369 | 836 |
32 | 837 } |
838 | |
839 | |
840 // ----- Motif header: ------- | |
841 | |
1236 | 842 #define MWM_HINTS_FUNCTIONS (1L << 0) |
843 #define MWM_HINTS_DECORATIONS (1L << 1) | |
844 #define MWM_HINTS_INPUT_MODE (1L << 2) | |
845 #define MWM_HINTS_STATUS (1L << 3) | |
846 | |
847 #define MWM_FUNC_ALL (1L << 0) | |
848 #define MWM_FUNC_RESIZE (1L << 1) | |
849 #define MWM_FUNC_MOVE (1L << 2) | |
850 #define MWM_FUNC_MINIMIZE (1L << 3) | |
851 #define MWM_FUNC_MAXIMIZE (1L << 4) | |
852 #define MWM_FUNC_CLOSE (1L << 5) | |
853 | |
854 #define MWM_DECOR_ALL (1L << 0) | |
855 #define MWM_DECOR_BORDER (1L << 1) | |
856 #define MWM_DECOR_RESIZEH (1L << 2) | |
857 #define MWM_DECOR_TITLE (1L << 3) | |
858 #define MWM_DECOR_MENU (1L << 4) | |
859 #define MWM_DECOR_MINIMIZE (1L << 5) | |
860 #define MWM_DECOR_MAXIMIZE (1L << 6) | |
861 | |
862 #define MWM_INPUT_MODELESS 0 | |
863 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 | |
864 #define MWM_INPUT_SYSTEM_MODAL 2 | |
865 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 | |
866 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL | |
867 | |
868 #define MWM_TEAROFF_WINDOW (1L<<0) | |
32 | 869 |
870 typedef struct | |
871 { | |
12582 | 872 long flags; |
873 long functions; | |
874 long decorations; | |
875 long input_mode; | |
876 long state; | |
32 | 877 } MotifWmHints; |
878 | |
12582 | 879 static MotifWmHints vo_MotifWmHints; |
880 static Atom vo_MotifHints = None; | |
32 | 881 |
12582 | 882 void vo_x11_decoration(Display * vo_Display, Window w, int d) |
32 | 883 { |
12582 | 884 static unsigned int olddecor = MWM_DECOR_ALL; |
885 static unsigned int oldfuncs = | |
886 MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | | |
887 MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; | |
888 Atom mtype; | |
889 int mformat; | |
890 unsigned long mn, mb; | |
891 | |
892 if (!WinID) | |
893 return; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
894 |
12582 | 895 if (vo_fsmode & 8) |
896 { | |
897 XSetTransientForHint(vo_Display, w, | |
898 RootWindow(vo_Display, mScreen)); | |
899 } | |
900 | |
901 vo_MotifHints = XInternAtom(vo_Display, "_MOTIF_WM_HINTS", 0); | |
902 if (vo_MotifHints != None) | |
903 { | |
904 if (!d) | |
905 { | |
906 MotifWmHints *mhints = NULL; | |
1415 | 907 |
12582 | 908 XGetWindowProperty(vo_Display, w, vo_MotifHints, 0, 20, False, |
909 vo_MotifHints, &mtype, &mformat, &mn, | |
910 &mb, (unsigned char **) &mhints); | |
911 if (mhints) | |
912 { | |
913 if (mhints->flags & MWM_HINTS_DECORATIONS) | |
914 olddecor = mhints->decorations; | |
915 if (mhints->flags & MWM_HINTS_FUNCTIONS) | |
916 oldfuncs = mhints->functions; | |
917 XFree(mhints); | |
918 } | |
919 } | |
12096 | 920 |
12582 | 921 memset(&vo_MotifWmHints, 0, sizeof(MotifWmHints)); |
922 vo_MotifWmHints.flags = | |
923 MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; | |
924 if (d) | |
925 { | |
926 vo_MotifWmHints.functions = oldfuncs; | |
927 d = olddecor; | |
928 } | |
4993 | 929 #if 0 |
12582 | 930 vo_MotifWmHints.decorations = |
931 d | ((vo_fsmode & 2) ? 0 : MWM_DECOR_MENU); | |
4993 | 932 #else |
12582 | 933 vo_MotifWmHints.decorations = |
934 d | ((vo_fsmode & 2) ? MWM_DECOR_MENU : 0); | |
4993 | 935 #endif |
12582 | 936 XChangeProperty(vo_Display, w, vo_MotifHints, vo_MotifHints, 32, |
937 PropModeReplace, | |
938 (unsigned char *) &vo_MotifWmHints, | |
939 (vo_fsmode & 4) ? 4 : 5); | |
940 } | |
32 | 941 } |
942 | |
12582 | 943 void vo_x11_classhint(Display * display, Window window, char *name) |
944 { | |
945 XClassHint wmClass; | |
946 pid_t pid = getpid(); | |
947 | |
948 wmClass.res_name = name; | |
949 wmClass.res_class = "MPlayer"; | |
950 XSetClassHint(display, window, &wmClass); | |
951 XChangeProperty(display, window, XA_NET_WM_PID, XA_CARDINAL, 32, | |
952 PropModeReplace, (unsigned char *) &pid, 1); | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
953 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
954 |
12582 | 955 Window vo_window = None; |
956 GC vo_gc = NULL; | |
957 GC f_gc = NULL; | |
4993 | 958 XSizeHints vo_hint; |
4795 | 959 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1501
diff
changeset
|
960 #ifdef HAVE_NEW_GUI |
12582 | 961 void vo_setwindow(Window w, GC g) |
962 { | |
963 vo_window = w; | |
964 vo_gc = g; | |
965 } | |
723 | 966 #endif |
967 | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17366
diff
changeset
|
968 void vo_x11_uninit(void) |
4437 | 969 { |
7111 | 970 saver_on(mDisplay); |
12582 | 971 if (vo_window != None) |
972 vo_showcursor(mDisplay, vo_window); | |
4742 | 973 |
12582 | 974 if (f_gc) |
975 { | |
976 XFreeGC(mDisplay, f_gc); | |
977 f_gc = NULL; | |
978 } | |
4437 | 979 #ifdef HAVE_NEW_GUI |
21938 | 980 /* destroy window only if it's not controlled by the GUI */ |
12582 | 981 if (!use_gui) |
4437 | 982 #endif |
983 { | |
12582 | 984 if (vo_gc) |
985 { | |
986 XSetBackground(mDisplay, vo_gc, 0); | |
987 XFreeGC(mDisplay, vo_gc); | |
988 vo_gc = NULL; | |
989 } | |
990 if (vo_window != None) | |
991 { | |
992 XClearWindow(mDisplay, vo_window); | |
993 if (WinID < 0) | |
994 { | |
995 XEvent xev; | |
996 | |
997 XUnmapWindow(mDisplay, vo_window); | |
998 XDestroyWindow(mDisplay, vo_window); | |
999 do | |
1000 { | |
1001 XNextEvent(mDisplay, &xev); | |
1002 } | |
1003 while (xev.type != DestroyNotify | |
1004 || xev.xdestroywindow.event != vo_window); | |
1005 } | |
1006 vo_window = None; | |
1007 } | |
1008 vo_fs = 0; | |
1009 vo_old_width = vo_old_height = 0; | |
4437 | 1010 } |
1011 } | |
1012 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1013 static unsigned int mouse_timer; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1014 static int mouse_waiting_hide; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
1015 |
12582 | 1016 int vo_x11_check_events(Display * mydisplay) |
1017 { | |
1018 int ret = 0; | |
1019 XEvent Event; | |
1020 char buf[100]; | |
1021 KeySym keySym; | |
1022 static XComposeStatus stat; | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
1023 |
32 | 1024 // unsigned long vo_KeyTable[512]; |
1025 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1026 if ((vo_mouse_autohide) && mouse_waiting_hide && |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1027 (GetTimerMS() - mouse_timer >= 1000)) { |
12582 | 1028 vo_hidecursor(mydisplay, vo_window); |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1029 mouse_waiting_hide = 0; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1030 } |
6095 | 1031 |
12582 | 1032 while (XPending(mydisplay)) |
1033 { | |
1034 XNextEvent(mydisplay, &Event); | |
1035 #ifdef HAVE_NEW_GUI | |
1036 if (use_gui) | |
1037 { | |
1038 guiGetEvent(0, (char *) &Event); | |
1039 if (vo_window != Event.xany.window) | |
1040 continue; | |
1041 } | |
1042 #endif | |
6095 | 1043 // printf("\rEvent.type=%X \n",Event.type); |
12582 | 1044 switch (Event.type) |
1045 { | |
1046 case Expose: | |
1047 ret |= VO_EVENT_EXPOSE; | |
1048 break; | |
1049 case ConfigureNotify: | |
1050 // if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break; | |
1051 // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break; | |
1052 if (vo_window == None) | |
1053 break; | |
1054 vo_dwidth = Event.xconfigure.width; | |
1055 vo_dheight = Event.xconfigure.height; | |
4812 | 1056 #if 0 |
12582 | 1057 /* when resizing, x and y are zero :( */ |
1058 vo_dx = Event.xconfigure.x; | |
1059 vo_dy = Event.xconfigure.y; | |
4812 | 1060 #else |
12582 | 1061 { |
1062 Window root; | |
1063 int foo; | |
1064 Window win; | |
1065 | |
1066 XGetGeometry(mydisplay, vo_window, &root, &foo, &foo, | |
1067 &foo /*width */ , &foo /*height */ , &foo, | |
1068 &foo); | |
1069 XTranslateCoordinates(mydisplay, vo_window, root, 0, 0, | |
1070 &vo_dx, &vo_dy, &win); | |
1071 } | |
1072 #endif | |
1073 ret |= VO_EVENT_RESIZE; | |
1074 break; | |
1075 case KeyPress: | |
1076 { | |
1077 int key; | |
1078 | |
14001 | 1079 #ifdef HAVE_NEW_GUI |
1080 if ( use_gui ) { break; } | |
1081 #endif | |
1082 | |
12582 | 1083 XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, |
1084 &stat); | |
1085 #ifdef XF86XK_AudioPause | |
1086 vo_x11_putkey_ext(keySym); | |
1087 #endif | |
1088 key = | |
1089 ((keySym & 0xff00) != | |
1090 0 ? ((keySym & 0x00ff) + 256) : (keySym)); | |
1091 vo_x11_putkey(key); | |
1092 ret |= VO_EVENT_KEYPRESS; | |
1093 } | |
1094 break; | |
1095 case MotionNotify: | |
19850
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1096 if(enable_mouse_movements) |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1097 { |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1098 char cmd_str[40]; |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1099 sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y); |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1100 mp_input_queue_cmd(mp_input_parse_cmd(cmd_str)); |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1101 } |
4919b3ce8d5e
report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents:
18950
diff
changeset
|
1102 |
12582 | 1103 if (vo_mouse_autohide) |
1104 { | |
1105 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1106 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1107 mouse_timer = GetTimerMS(); |
12582 | 1108 } |
1109 break; | |
1110 case ButtonPress: | |
1111 if (vo_mouse_autohide) | |
1112 { | |
1113 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1114 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1115 mouse_timer = GetTimerMS(); |
12582 | 1116 } |
1117 #ifdef HAVE_NEW_GUI | |
21938 | 1118 // Ignore mouse button 1-3 under GUI. |
12582 | 1119 if (use_gui && (Event.xbutton.button >= 1) |
1120 && (Event.xbutton.button <= 3)) | |
1121 break; | |
1122 #endif | |
1123 mplayer_put_key((MOUSE_BTN0 + Event.xbutton.button - | |
1124 1) | MP_KEY_DOWN); | |
1125 break; | |
1126 case ButtonRelease: | |
1127 if (vo_mouse_autohide) | |
1128 { | |
1129 vo_showcursor(mydisplay, vo_window); | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1130 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
1131 mouse_timer = GetTimerMS(); |
12582 | 1132 } |
1133 #ifdef HAVE_NEW_GUI | |
21938 | 1134 // Ignore mouse button 1-3 under GUI. |
12582 | 1135 if (use_gui && (Event.xbutton.button >= 1) |
1136 && (Event.xbutton.button <= 3)) | |
1137 break; | |
1138 #endif | |
1139 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
1140 break; | |
1141 case PropertyNotify: | |
1142 { | |
1143 char *name = | |
1144 XGetAtomName(mydisplay, Event.xproperty.atom); | |
1145 | |
1146 if (!name) | |
1147 break; | |
1148 | |
6046 | 1149 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); |
12582 | 1150 |
1151 XFree(name); | |
1152 } | |
1153 break; | |
1154 case MapNotify: | |
1155 vo_hint.win_gravity = old_gravity; | |
1156 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
1157 vo_fs_flip = 0; | |
1158 break; | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1159 case ClientMessage: |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1160 if (Event.xclient.message_type == XAWM_PROTOCOLS && |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1161 Event.xclient.data.l[0] == XAWM_DELETE_WINDOW) |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1162 mplayer_put_key(KEY_CLOSE_WIN); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1163 break; |
12582 | 1164 } |
1165 } | |
1166 return ret; | |
32 | 1167 } |
1168 | |
13843 | 1169 /** |
1170 * \brief sets the size and position of the non-fullscreen window. | |
1171 */ | |
1172 void vo_x11_nofs_sizepos(int x, int y, int width, int height) | |
1173 { | |
24312
716b7751e7ad
Make sure aspect hint is adjusted on aspect change
reimar
parents:
24311
diff
changeset
|
1174 vo_x11_sizehint(x, y, width, height, 0); |
13843 | 1175 if (vo_fs) { |
1176 vo_old_x = x; | |
1177 vo_old_y = y; | |
1178 vo_old_width = width; | |
1179 vo_old_height = height; | |
1180 } | |
1181 else | |
13871 | 1182 { |
1183 vo_dwidth = width; | |
1184 vo_dheight = height; | |
13843 | 1185 XMoveResizeWindow(mDisplay, vo_window, x, y, width, height); |
13871 | 1186 } |
13843 | 1187 } |
1188 | |
12582 | 1189 void vo_x11_sizehint(int x, int y, int width, int height, int max) |
4993 | 1190 { |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1191 vo_hint.flags = 0; |
12582 | 1192 if (vo_keepaspect) |
1193 { | |
1194 vo_hint.flags |= PAspect; | |
1195 vo_hint.min_aspect.x = width; | |
1196 vo_hint.min_aspect.y = height; | |
1197 vo_hint.max_aspect.x = width; | |
1198 vo_hint.max_aspect.y = height; | |
1199 } | |
8692
604f0cde816c
X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents:
8676
diff
changeset
|
1200 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1201 vo_hint.flags |= PPosition | PSize; |
12582 | 1202 vo_hint.x = x; |
1203 vo_hint.y = y; | |
1204 vo_hint.width = width; | |
1205 vo_hint.height = height; | |
1206 if (max) | |
1207 { | |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1208 vo_hint.flags |= PMaxSize; |
12582 | 1209 vo_hint.max_width = width; |
1210 vo_hint.max_height = height; | |
1211 } else | |
1212 { | |
1213 vo_hint.max_width = 0; | |
1214 vo_hint.max_height = 0; | |
1215 } | |
11995 | 1216 |
21938 | 1217 // Set minimum height/width to 4 to avoid off-by-one errors |
1218 // and because mga_vid requires a minimal size of 4 pixels. | |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1219 vo_hint.flags |= PMinSize; |
12582 | 1220 vo_hint.min_width = vo_hint.min_height = 4; |
11995 | 1221 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1222 vo_hint.flags |= PWinGravity; |
12582 | 1223 vo_hint.win_gravity = StaticGravity; |
1224 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
4993 | 1225 } |
1226 | |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1227 static int vo_x11_get_gnome_layer(Display * mDisplay, Window win) |
8866 | 1228 { |
12582 | 1229 Atom type; |
1230 int format; | |
1231 unsigned long nitems; | |
1232 unsigned long bytesafter; | |
1233 unsigned short *args = NULL; | |
8866 | 1234 |
12582 | 1235 if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384, |
1236 False, AnyPropertyType, &type, &format, &nitems, | |
1237 &bytesafter, | |
1238 (unsigned char **) &args) == Success | |
1239 && nitems > 0 && args) | |
1240 { | |
1241 mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n", | |
1242 *args); | |
1243 return *args; | |
1244 } | |
1245 return WIN_LAYER_NORMAL; | |
8866 | 1246 } |
1247 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1248 // |
12582 | 1249 Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot, |
1250 Visual * vis, int x, int y, | |
1251 unsigned int width, unsigned int height, | |
1252 int depth, Colormap col_map) | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1253 { |
12582 | 1254 unsigned long xswamask = CWBackingStore | CWBorderPixel; |
1255 XSetWindowAttributes xswa; | |
1256 Window ret_win; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1257 |
12582 | 1258 if (col_map != CopyFromParent) |
1259 { | |
1260 xswa.colormap = col_map; | |
1261 xswamask |= CWColormap; | |
1262 } | |
1263 xswa.background_pixel = 0; | |
1264 xswa.border_pixel = 0; | |
1265 xswa.backing_store = Always; | |
1266 xswa.bit_gravity = StaticGravity; | |
1267 | |
1268 ret_win = | |
1269 XCreateWindow(mDisplay, mRootWin, x, y, width, height, 0, depth, | |
1270 CopyFromParent, vis, xswamask, &xswa); | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1271 XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1); |
12582 | 1272 if (!f_gc) |
1273 f_gc = XCreateGC(mDisplay, ret_win, 0, 0); | |
1274 XSetForeground(mDisplay, f_gc, 0); | |
1275 | |
1276 return ret_win; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1277 } |
12582 | 1278 |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1279 /** |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1280 * \brief create and setup a window suitable for display |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1281 * \param vis Visual to use for creating the window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1282 * \param x x position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1283 * \param y y position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1284 * \param width width of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1285 * \param height height of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1286 * \param flags flags for window creation. |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1287 * Only VOFLAG_FULLSCREEN is supported so far. |
23823
513293585949
document "default" behaviour if CopyFromParent is passed as colormap
attila
parents:
23660
diff
changeset
|
1288 * \param col_map Colourmap for window or CopyFromParent if a specific colormap isn't needed |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1289 * \param classname name to use for the classhint |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1290 * \param title title for the window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1291 * |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1292 * This also does the grunt-work like setting Window Manager hints etc. |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1293 * If vo_window is already set it just moves and resizes it. |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1294 */ |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1295 void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1296 unsigned int width, unsigned int height, int flags, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1297 Colormap col_map, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1298 const char *classname, const char *title) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1299 { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1300 if (vo_window == None) { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1301 XSizeHints hint; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1302 XEvent xev; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1303 vo_fs = 0; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1304 vo_dwidth = width; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1305 vo_dheight = height; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1306 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vis->visual, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1307 x, y, width, height, vis->depth, col_map); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1308 vo_x11_classhint(mDisplay, vo_window, classname); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1309 XStoreName(mDisplay, vo_window, title); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1310 vo_hidecursor(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1311 XSelectInput(mDisplay, vo_window, StructureNotifyMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1312 hint.x = x; hint.y = y; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1313 hint.width = width; hint.height = height; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1314 hint.flags = PPosition | PSize; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1315 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1316 vo_x11_sizehint(x, y, width, height, 0); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1317 // map window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1318 XMapWindow(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1319 XClearWindow(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1320 // wait for map |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1321 do { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1322 XNextEvent(mDisplay, &xev); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1323 } while (xev.type != MapNotify || xev.xmap.event != vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1324 XSelectInput(mDisplay, vo_window, NoEventMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1325 XSync(mDisplay, False); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1326 vo_x11_selectinput_witherr(mDisplay, vo_window, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1327 StructureNotifyMask | KeyPressMask | PointerMotionMask | |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1328 ButtonPressMask | ButtonReleaseMask | ExposureMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1329 } |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1330 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1331 vo_x11_nofs_sizepos(vo_dx, vo_dy, width, height); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1332 if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN)) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1333 vo_x11_fullscreen(); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1334 } |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1335 |
12582 | 1336 void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window, |
1337 int img_width, int img_height, int use_fs) | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1338 { |
12582 | 1339 int u_dheight, u_dwidth, left_ov, left_ov2; |
10765
c8fb7e2690a3
10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents:
10757
diff
changeset
|
1340 |
12582 | 1341 if (!f_gc) |
1342 return; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1343 |
12582 | 1344 u_dheight = use_fs ? vo_screenheight : vo_dheight; |
1345 u_dwidth = use_fs ? vo_screenwidth : vo_dwidth; | |
1346 if ((u_dheight <= img_height) && (u_dwidth <= img_width)) | |
1347 return; | |
10765
c8fb7e2690a3
10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents:
10757
diff
changeset
|
1348 |
12582 | 1349 left_ov = (u_dheight - img_height) / 2; |
1350 left_ov2 = (u_dwidth - img_width) / 2; | |
1351 | |
1352 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov); | |
1353 XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1, | |
1354 u_dwidth, left_ov + 1); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1355 |
12582 | 1356 if (u_dwidth > img_width) |
1357 { | |
1358 XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2, | |
1359 img_height); | |
1360 XFillRectangle(mDisplay, vo_window, f_gc, u_dwidth - left_ov2 - 1, | |
23660
3ab096c77b9e
Fix vo_x11_clearwindow_part: x position is one less to avoid not clearing
reimar
parents:
23655
diff
changeset
|
1361 left_ov, left_ov2 + 1, img_height); |
12582 | 1362 } |
1363 | |
1364 XFlush(mDisplay); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1365 } |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1366 |
12582 | 1367 void vo_x11_clearwindow(Display * mDisplay, Window vo_window) |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1368 { |
12582 | 1369 if (!f_gc) |
1370 return; | |
1371 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth, | |
1372 vo_screenheight); | |
1373 // | |
1374 XFlush(mDisplay); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1375 } |
12582 | 1376 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1377 |
12582 | 1378 void vo_x11_setlayer(Display * mDisplay, Window vo_window, int layer) |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1379 { |
12582 | 1380 if (WinID >= 0) |
1381 return; | |
8864 | 1382 |
12582 | 1383 if (vo_fs_type & vo_wm_LAYER) |
1384 { | |
1385 XClientMessageEvent xev; | |
1386 | |
1387 if (!orig_layer) | |
1388 orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window); | |
8866 | 1389 |
12582 | 1390 memset(&xev, 0, sizeof(xev)); |
1391 xev.type = ClientMessage; | |
1392 xev.display = mDisplay; | |
1393 xev.window = vo_window; | |
1394 xev.message_type = XA_WIN_LAYER; | |
1395 xev.format = 32; | |
1396 xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer | |
1397 xev.data.l[1] = CurrentTime; | |
1398 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1399 "[x11] Layered style stay on top (layer %ld).\n", |
12582 | 1400 xev.data.l[0]); |
1401 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, | |
1402 (XEvent *) & xev); | |
1403 } else if (vo_fs_type & vo_wm_NETWM) | |
1404 { | |
1405 XClientMessageEvent xev; | |
1406 char *state; | |
8645 | 1407 |
12582 | 1408 memset(&xev, 0, sizeof(xev)); |
1409 xev.type = ClientMessage; | |
1410 xev.message_type = XA_NET_WM_STATE; | |
1411 xev.display = mDisplay; | |
1412 xev.window = vo_window; | |
1413 xev.format = 32; | |
1414 xev.data.l[0] = layer; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1415 |
12582 | 1416 if (vo_fs_type & vo_wm_STAYS_ON_TOP) |
1417 xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP; | |
1418 else if (vo_fs_type & vo_wm_ABOVE) | |
1419 xev.data.l[1] = XA_NET_WM_STATE_ABOVE; | |
1420 else if (vo_fs_type & vo_wm_FULLSCREEN) | |
1421 xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN; | |
1422 else if (vo_fs_type & vo_wm_BELOW) | |
21938 | 1423 // This is not fallback. We can safely assume that the situation |
1424 // where only NETWM_STATE_BELOW is supported doesn't exist. | |
12582 | 1425 xev.data.l[1] = XA_NET_WM_STATE_BELOW; |
1426 | |
1427 XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask, | |
1428 (XEvent *) & xev); | |
1429 state = XGetAtomName(mDisplay, xev.data.l[1]); | |
1430 mp_msg(MSGT_VO, MSGL_V, | |
1431 "[x11] NET style stay on top (layer %d). Using state %s.\n", | |
1432 layer, state); | |
1433 XFree(state); | |
1434 } | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1435 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1436 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1437 static int vo_x11_get_fs_type(int supported) |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1438 { |
12582 | 1439 int i; |
1440 int type = supported; | |
1441 | |
1442 if (vo_fstype_list) | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1443 { |
12582 | 1444 i = 0; |
1445 for (i = 0; vo_fstype_list[i]; i++) | |
1446 { | |
1447 int neg = 0; | |
1448 char *arg = vo_fstype_list[i]; | |
1449 | |
1450 if (vo_fstype_list[i][0] == '-') | |
1451 { | |
1452 neg = 1; | |
1453 arg = vo_fstype_list[i] + 1; | |
1454 } | |
1455 | |
1456 if (!strncmp(arg, "layer", 5)) | |
1457 { | |
1458 if (!neg && (arg[5] == '=')) | |
1459 { | |
1460 char *endptr = NULL; | |
1461 int layer = strtol(vo_fstype_list[i] + 6, &endptr, 10); | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1462 |
12582 | 1463 if (endptr && *endptr == '\0' && layer >= 0 |
1464 && layer <= 15) | |
1465 fs_layer = layer; | |
1466 } | |
1467 if (neg) | |
1468 type &= ~vo_wm_LAYER; | |
1469 else | |
1470 type |= vo_wm_LAYER; | |
1471 } else if (!strcmp(arg, "above")) | |
1472 { | |
1473 if (neg) | |
1474 type &= ~vo_wm_ABOVE; | |
1475 else | |
1476 type |= vo_wm_ABOVE; | |
1477 } else if (!strcmp(arg, "fullscreen")) | |
1478 { | |
1479 if (neg) | |
1480 type &= ~vo_wm_FULLSCREEN; | |
1481 else | |
1482 type |= vo_wm_FULLSCREEN; | |
1483 } else if (!strcmp(arg, "stays_on_top")) | |
1484 { | |
1485 if (neg) | |
1486 type &= ~vo_wm_STAYS_ON_TOP; | |
1487 else | |
1488 type |= vo_wm_STAYS_ON_TOP; | |
1489 } else if (!strcmp(arg, "below")) | |
1490 { | |
1491 if (neg) | |
1492 type &= ~vo_wm_BELOW; | |
1493 else | |
1494 type |= vo_wm_BELOW; | |
1495 } else if (!strcmp(arg, "netwm")) | |
1496 { | |
1497 if (neg) | |
1498 type &= ~vo_wm_NETWM; | |
1499 else | |
1500 type |= vo_wm_NETWM; | |
1501 } else if (!strcmp(arg, "none")) | |
1502 return 0; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1503 } |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1504 } |
5919 | 1505 |
12582 | 1506 return type; |
4981 | 1507 } |
1508 | |
12582 | 1509 void vo_x11_fullscreen(void) |
11542 | 1510 { |
12582 | 1511 int x, y, w, h; |
1512 | |
1513 if (WinID >= 0 || vo_fs_flip) | |
1514 return; | |
1515 | |
1516 if (vo_fs) | |
1517 { | |
1518 // fs->win | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1519 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1520 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1521 x = vo_old_x; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1522 y = vo_old_y; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1523 w = vo_old_width; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1524 h = vo_old_height; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1525 } |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1526 |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1527 vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE); // removes fullscreen state if wm supports EWMH |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1528 vo_fs = VO_FALSE; |
12582 | 1529 } else |
1530 { | |
1531 // win->fs | |
1532 vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH | |
1533 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1534 vo_fs = VO_TRUE; |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1535 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1536 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1537 vo_old_x = vo_dx; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1538 vo_old_y = vo_dy; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1539 vo_old_width = vo_dwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1540 vo_old_height = vo_dheight; |
23875
df05ff41590e
make sure update_xinerama_info is always called even when using the
reimar
parents:
23823
diff
changeset
|
1541 } |
18116 | 1542 update_xinerama_info(); |
1543 x = xinerama_x; | |
1544 y = xinerama_y; | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1545 w = vo_screenwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1546 h = vo_screenheight; |
12582 | 1547 } |
1548 { | |
1549 long dummy; | |
1550 | |
1551 XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy); | |
1552 if (!(vo_hint.flags & PWinGravity)) | |
1553 old_gravity = NorthWestGravity; | |
1554 else | |
1555 old_gravity = vo_hint.win_gravity; | |
1556 } | |
1557 if (vo_wm_type == 0 && !(vo_fsmode & 16)) | |
1558 { | |
1559 XUnmapWindow(mDisplay, vo_window); // required for MWM | |
1560 XWithdrawWindow(mDisplay, vo_window, mScreen); | |
1561 vo_fs_flip = 1; | |
1562 } | |
1563 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1564 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1565 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1566 vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1567 vo_x11_sizehint(x, y, w, h, 0); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1568 vo_x11_setlayer(mDisplay, vo_window, vo_fs); |
12582 | 1569 |
1570 | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1571 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1572 } |
21938 | 1573 /* some WMs lose ontop after fullscreen */ |
14244
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1574 if ((!(vo_fs)) & vo_ontop) |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1575 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1576 |
12582 | 1577 XMapRaised(mDisplay, vo_window); |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1578 if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // some WMs change window pos on map |
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1579 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12582 | 1580 XRaiseWindow(mDisplay, vo_window); |
1581 XFlush(mDisplay); | |
1582 } | |
1583 | |
1584 void vo_x11_ontop(void) | |
1585 { | |
1586 vo_ontop = (!(vo_ontop)); | |
1587 | |
1588 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 1589 } |
1590 | |
9695 | 1591 /* |
1592 * XScreensaver stuff | |
1593 */ | |
1594 | |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1595 static int screensaver_off; |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1596 static unsigned int time_last; |
9695 | 1597 |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1598 void xscreensaver_heartbeat(void) |
9695 | 1599 { |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1600 unsigned int time = GetTimerMS(); |
9695 | 1601 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1602 if (mDisplay && screensaver_off && (time - time_last) > 30000) |
12582 | 1603 { |
1604 time_last = time; | |
9695 | 1605 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1606 XResetScreenSaver(mDisplay); |
9695 | 1607 } |
1608 } | |
1609 | |
25466 | 1610 static int xss_suspend(Bool suspend) |
1611 { | |
1612 #ifndef HAVE_XSS | |
1613 return 0; | |
1614 #else | |
1615 int event, error, major, minor; | |
1616 if (XScreenSaverQueryExtension(mDisplay, &event, &error) != True || | |
1617 XScreenSaverQueryVersion(mDisplay, &major, &minor) != True) | |
1618 return 0; | |
1619 if (major < 1 || major == 1 && minor < 1) | |
1620 return 0; | |
1621 XScreenSaverSuspend(mDisplay, suspend); | |
1622 return 1; | |
1623 #endif | |
1624 } | |
1625 | |
9695 | 1626 /* |
1627 * End of XScreensaver stuff | |
1628 */ | |
1629 | |
12582 | 1630 void saver_on(Display * mDisplay) |
1631 { | |
324 | 1632 |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1633 if (!screensaver_off) |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1634 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1635 screensaver_off = 0; |
25466 | 1636 if (xss_suspend(False)) |
1637 return; | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1638 #ifdef HAVE_XDPMS |
324 | 1639 if (dpms_disabled) |
1640 { | |
25447 | 1641 int nothing; |
12582 | 1642 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1643 { | |
1644 if (!DPMSEnable(mDisplay)) | |
1645 { // restoring power saving settings | |
1646 mp_msg(MSGT_VO, MSGL_WARN, "DPMS not available?\n"); | |
1647 } else | |
1648 { | |
741 | 1649 // DPMS does not seem to be enabled unless we call DPMSInfo |
12582 | 1650 BOOL onoff; |
1651 CARD16 state; | |
1652 | |
1653 DPMSForceLevel(mDisplay, DPMSModeOn); | |
1654 DPMSInfo(mDisplay, &state, &onoff); | |
1655 if (onoff) | |
1656 { | |
13946 | 1657 mp_msg(MSGT_VO, MSGL_V, |
12582 | 1658 "Successfully enabled DPMS\n"); |
1659 } else | |
1660 { | |
1661 mp_msg(MSGT_VO, MSGL_WARN, "Could not enable DPMS\n"); | |
741 | 1662 } |
1663 } | |
12582 | 1664 } |
1665 dpms_disabled = 0; | |
324 | 1666 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1667 #endif |
324 | 1668 } |
1669 | |
12582 | 1670 void saver_off(Display * mDisplay) |
1671 { | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1672 int nothing; |
324 | 1673 |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1674 if (screensaver_off) |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1675 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1676 screensaver_off = 1; |
25466 | 1677 if (xss_suspend(True)) |
1678 return; | |
1679 #ifdef HAVE_XDPMS | |
324 | 1680 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1681 { | |
12582 | 1682 BOOL onoff; |
1683 CARD16 state; | |
1684 | |
1685 DPMSInfo(mDisplay, &state, &onoff); | |
1686 if (onoff) | |
1687 { | |
1688 Status stat; | |
1689 | |
13946 | 1690 mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n"); |
12582 | 1691 dpms_disabled = 1; |
1692 stat = DPMSDisable(mDisplay); // monitor powersave off | |
1693 mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat); | |
1694 } | |
324 | 1695 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1696 #endif |
326 | 1697 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1698 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1699 static XErrorHandler old_handler = NULL; |
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1700 static int selectinput_err = 0; |
12582 | 1701 static int x11_selectinput_errorhandler(Display * display, |
1702 XErrorEvent * event) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1703 { |
12582 | 1704 if (event->error_code == BadAccess) |
1705 { | |
1706 selectinput_err = 1; | |
1707 mp_msg(MSGT_VO, MSGL_ERR, | |
1708 "X11 error: BadAccess during XSelectInput Call\n"); | |
1709 mp_msg(MSGT_VO, MSGL_ERR, | |
1710 "X11 error: The 'ButtonPressMask' mask of specified window has probably already used by another appication (see man XSelectInput)\n"); | |
21938 | 1711 /* If you think MPlayer should shutdown with this error, |
1712 * comment out the following line */ | |
12582 | 1713 return 0; |
1714 } | |
1715 if (old_handler != NULL) | |
1716 old_handler(display, event); | |
1717 else | |
1718 x11_errorhandler(display, event); | |
1719 return 0; | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1720 } |
3990 | 1721 |
12582 | 1722 void vo_x11_selectinput_witherr(Display * display, Window w, |
1723 long event_mask) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1724 { |
12582 | 1725 XSync(display, False); |
1726 old_handler = XSetErrorHandler(x11_selectinput_errorhandler); | |
1727 selectinput_err = 0; | |
1728 if (vo_nomouse_input) | |
1729 { | |
1730 XSelectInput(display, w, | |
1731 event_mask & | |
1732 (~(ButtonPressMask | ButtonReleaseMask))); | |
1733 } else | |
1734 { | |
1735 XSelectInput(display, w, event_mask); | |
1736 } | |
1737 XSync(display, False); | |
1738 XSetErrorHandler(old_handler); | |
1739 if (selectinput_err) | |
1740 { | |
1741 mp_msg(MSGT_VO, MSGL_ERR, | |
1742 "X11 error: MPlayer discards mouse control (reconfiguring)\n"); | |
1743 XSelectInput(display, w, | |
1744 event_mask & | |
1745 (~ | |
1746 (ButtonPressMask | ButtonReleaseMask | | |
1747 PointerMotionMask))); | |
1748 } | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1749 } |
3990 | 1750 |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1751 #ifdef HAVE_XF86VM |
12582 | 1752 void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width, |
1753 int *modeline_height) | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1754 { |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1755 int vm_event, vm_error; |
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1756 int vm_ver, vm_rev; |
12582 | 1757 int i, j, have_vm = 0; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1758 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1759 int modecount; |
12582 | 1760 |
1761 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) | |
1762 { | |
1763 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
18508 | 1764 mp_msg(MSGT_VO, MSGL_V, "XF86VidMode extension v%i.%i\n", vm_ver, |
12582 | 1765 vm_rev); |
1766 have_vm = 1; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1767 } else |
12582 | 1768 mp_msg(MSGT_VO, MSGL_WARN, |
18508 | 1769 "XF86VidMode extension not available.\n"); |
12582 | 1770 |
1771 if (have_vm) | |
1772 { | |
1773 if (vidmodes == NULL) | |
1774 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1775 &vidmodes); | |
1776 j = 0; | |
1777 *modeline_width = vidmodes[0]->hdisplay; | |
1778 *modeline_height = vidmodes[0]->vdisplay; | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1779 |
12582 | 1780 for (i = 1; i < modecount; i++) |
1781 if ((vidmodes[i]->hdisplay >= X) | |
1782 && (vidmodes[i]->vdisplay >= Y)) | |
1783 if ((vidmodes[i]->hdisplay <= *modeline_width) | |
1784 && (vidmodes[i]->vdisplay <= *modeline_height)) | |
1785 { | |
1786 *modeline_width = vidmodes[i]->hdisplay; | |
1787 *modeline_height = vidmodes[i]->vdisplay; | |
1788 j = i; | |
1789 } | |
1790 | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16301
diff
changeset
|
1791 mp_msg(MSGT_VO, MSGL_INFO, MSGTR_SelectedVideoMode, |
12582 | 1792 *modeline_width, *modeline_height, X, Y); |
1793 XF86VidModeLockModeSwitch(mDisplay, mScreen, 0); | |
1794 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1795 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1796 X = (vo_screenwidth - *modeline_width) / 2; | |
1797 Y = (vo_screenheight - *modeline_height) / 2; | |
1798 XF86VidModeSetViewPort(mDisplay, mScreen, X, Y); | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1799 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1800 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1801 |
12582 | 1802 void vo_vm_close(Display * dpy) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1803 { |
12582 | 1804 #ifdef HAVE_NEW_GUI |
1805 if (vidmodes != NULL && vo_window != None) | |
1806 #else | |
1807 if (vidmodes != NULL) | |
1808 #endif | |
1809 { | |
1810 int i, modecount; | |
1811 int screen; | |
1812 | |
1813 screen = DefaultScreen(dpy); | |
5019 | 1814 |
12582 | 1815 free(vidmodes); |
1816 vidmodes = NULL; | |
1817 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1818 &vidmodes); | |
1819 for (i = 0; i < modecount; i++) | |
1820 if ((vidmodes[i]->hdisplay == vo_screenwidth) | |
1821 && (vidmodes[i]->vdisplay == vo_screenheight)) | |
1822 { | |
1823 mp_msg(MSGT_VO, MSGL_INFO, | |
1824 "Returning to original mode %dx%d\n", | |
1825 vo_screenwidth, vo_screenheight); | |
1826 break; | |
1827 } | |
5019 | 1828 |
12582 | 1829 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); |
1830 XF86VidModeSwitchToMode(dpy, screen, vidmodes[i]); | |
1831 free(vidmodes); | |
1832 vidmodes = NULL; | |
1833 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1834 } |
3990 | 1835 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1836 |
12582 | 1837 #endif /* X11_FULLSCREEN */ |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1838 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1839 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1840 /* |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1841 * Scan the available visuals on this Display/Screen. Try to find |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1842 * the 'best' available TrueColor visual that has a decent color |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1843 * depth (at least 15bit). If there are multiple visuals with depth |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1844 * >= 15bit, we prefer visuals with a smaller color depth. |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1845 */ |
12582 | 1846 int vo_find_depth_from_visuals(Display * dpy, int screen, |
1847 Visual ** visual_return) | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1848 { |
12582 | 1849 XVisualInfo visual_tmpl; |
1850 XVisualInfo *visuals; | |
1851 int nvisuals, i; | |
1852 int bestvisual = -1; | |
1853 int bestvisual_depth = -1; | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1854 |
12582 | 1855 visual_tmpl.screen = screen; |
1856 visual_tmpl.class = TrueColor; | |
1857 visuals = XGetVisualInfo(dpy, | |
1858 VisualScreenMask | VisualClassMask, | |
1859 &visual_tmpl, &nvisuals); | |
1860 if (visuals != NULL) | |
1861 { | |
1862 for (i = 0; i < nvisuals; i++) | |
1863 { | |
1864 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1865 "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n", |
12582 | 1866 visuals[i].visualid, visuals[i].depth, |
1867 visuals[i].red_mask, visuals[i].green_mask, | |
1868 visuals[i].blue_mask); | |
1869 /* | |
21938 | 1870 * Save the visual index and its depth, if this is the first |
12582 | 1871 * truecolor visul, or a visual that is 'preferred' over the |
21938 | 1872 * previous 'best' visual. |
12582 | 1873 */ |
1874 if (bestvisual_depth == -1 | |
1875 || (visuals[i].depth >= 15 | |
1876 && (visuals[i].depth < bestvisual_depth | |
1877 || bestvisual_depth < 15))) | |
1878 { | |
1879 bestvisual = i; | |
1880 bestvisual_depth = visuals[i].depth; | |
1881 } | |
1882 } | |
1883 | |
1884 if (bestvisual != -1 && visual_return != NULL) | |
1885 *visual_return = visuals[bestvisual].visual; | |
1886 | |
1887 XFree(visuals); | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1888 } |
12582 | 1889 return bestvisual_depth; |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1890 } |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1891 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1892 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1893 static Colormap cmap = None; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1894 static XColor cols[256]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1895 static int cm_size, red_mask, green_mask, blue_mask; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1896 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1897 |
12582 | 1898 Colormap vo_x11_create_colormap(XVisualInfo * vinfo) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1899 { |
12582 | 1900 unsigned k, r, g, b, ru, gu, bu, m, rv, gv, bv, rvu, gvu, bvu; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1901 |
12582 | 1902 if (vinfo->class != DirectColor) |
1903 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, | |
1904 AllocNone); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1905 |
12582 | 1906 /* can this function get called twice or more? */ |
1907 if (cmap) | |
1908 return cmap; | |
1909 cm_size = vinfo->colormap_size; | |
1910 red_mask = vinfo->red_mask; | |
1911 green_mask = vinfo->green_mask; | |
1912 blue_mask = vinfo->blue_mask; | |
1913 ru = (red_mask & (red_mask - 1)) ^ red_mask; | |
1914 gu = (green_mask & (green_mask - 1)) ^ green_mask; | |
1915 bu = (blue_mask & (blue_mask - 1)) ^ blue_mask; | |
1916 rvu = 65536ull * ru / (red_mask + ru); | |
1917 gvu = 65536ull * gu / (green_mask + gu); | |
1918 bvu = 65536ull * bu / (blue_mask + bu); | |
1919 r = g = b = 0; | |
1920 rv = gv = bv = 0; | |
1921 m = DoRed | DoGreen | DoBlue; | |
1922 for (k = 0; k < cm_size; k++) | |
1923 { | |
1924 int t; | |
1925 | |
1926 cols[k].pixel = r | g | b; | |
1927 cols[k].red = rv; | |
1928 cols[k].green = gv; | |
1929 cols[k].blue = bv; | |
1930 cols[k].flags = m; | |
1931 t = (r + ru) & red_mask; | |
1932 if (t < r) | |
1933 m &= ~DoRed; | |
1934 r = t; | |
1935 t = (g + gu) & green_mask; | |
1936 if (t < g) | |
1937 m &= ~DoGreen; | |
1938 g = t; | |
1939 t = (b + bu) & blue_mask; | |
1940 if (t < b) | |
1941 m &= ~DoBlue; | |
1942 b = t; | |
1943 rv += rvu; | |
1944 gv += gvu; | |
1945 bv += bvu; | |
1946 } | |
1947 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll); | |
1948 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1949 return cmap; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1950 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1951 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1952 /* |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1953 * Via colormaps/gamma ramps we can do gamma, brightness, contrast, |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1954 * hue and red/green/blue intensity, but we cannot do saturation. |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1955 * Currently only gamma, brightness and contrast are implemented. |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1956 * Is there sufficient interest for hue and/or red/green/blue intensity? |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1957 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1958 /* these values have range [-100,100] and are initially 0 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1959 static int vo_gamma = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1960 static int vo_brightness = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1961 static int vo_contrast = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1962 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1963 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1964 uint32_t vo_x11_set_equalizer(char *name, int value) |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1965 { |
12582 | 1966 float gamma, brightness, contrast; |
1967 float rf, gf, bf; | |
1968 int k; | |
1969 | |
1970 /* | |
1971 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case | |
1972 * of TrueColor-ed window but be careful: | |
21938 | 1973 * Unlike the colormaps, which are private for the X client |
12582 | 1974 * who created them and thus automatically destroyed on client |
1975 * disconnect, this gamma ramp is a system-wide (X-server-wide) | |
21938 | 1976 * setting and _must_ be restored before the process exits. |
1977 * Unforunately when the process crashes (or gets killed | |
12582 | 1978 * for some reason) it is impossible to restore the setting, |
1979 * and such behaviour could be rather annoying for the users. | |
1980 */ | |
1981 if (cmap == None) | |
1982 return VO_NOTAVAIL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1983 |
12582 | 1984 if (!strcasecmp(name, "brightness")) |
1985 vo_brightness = value; | |
1986 else if (!strcasecmp(name, "contrast")) | |
1987 vo_contrast = value; | |
1988 else if (!strcasecmp(name, "gamma")) | |
1989 vo_gamma = value; | |
1990 else | |
1991 return VO_NOTIMPL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1992 |
12582 | 1993 brightness = 0.01 * vo_brightness; |
1994 contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4); | |
1995 gamma = pow(2, -0.02 * vo_gamma); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1996 |
12582 | 1997 rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask; |
1998 gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) / | |
1999 green_mask; | |
2000 bf = (float) ((blue_mask & (blue_mask - 1)) ^ blue_mask) / blue_mask; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2001 |
12582 | 2002 /* now recalculate the colormap using the newly set value */ |
2003 for (k = 0; k < cm_size; k++) | |
2004 { | |
2005 float s; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2006 |
12582 | 2007 s = pow(rf * k, gamma); |
2008 s = (s - 0.5) * contrast + 0.5; | |
2009 s += brightness; | |
2010 if (s < 0) | |
2011 s = 0; | |
2012 if (s > 1) | |
2013 s = 1; | |
2014 cols[k].red = (unsigned short) (s * 65535); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2015 |
12582 | 2016 s = pow(gf * k, gamma); |
2017 s = (s - 0.5) * contrast + 0.5; | |
2018 s += brightness; | |
2019 if (s < 0) | |
2020 s = 0; | |
2021 if (s > 1) | |
2022 s = 1; | |
2023 cols[k].green = (unsigned short) (s * 65535); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2024 |
12582 | 2025 s = pow(bf * k, gamma); |
2026 s = (s - 0.5) * contrast + 0.5; | |
2027 s += brightness; | |
2028 if (s < 0) | |
2029 s = 0; | |
2030 if (s > 1) | |
2031 s = 1; | |
2032 cols[k].blue = (unsigned short) (s * 65535); | |
2033 } | |
2034 | |
2035 XStoreColors(mDisplay, cmap, cols, cm_size); | |
2036 XFlush(mDisplay); | |
2037 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2038 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2039 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2040 uint32_t vo_x11_get_equalizer(char *name, int *value) |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2041 { |
12582 | 2042 if (cmap == None) |
2043 return VO_NOTAVAIL; | |
2044 if (!strcasecmp(name, "brightness")) | |
2045 *value = vo_brightness; | |
2046 else if (!strcasecmp(name, "contrast")) | |
2047 *value = vo_contrast; | |
2048 else if (!strcasecmp(name, "gamma")) | |
2049 *value = vo_gamma; | |
2050 else | |
2051 return VO_NOTIMPL; | |
2052 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2053 } |
12582 | 2054 |
10359 | 2055 #ifdef HAVE_XV |
2056 int vo_xv_set_eq(uint32_t xv_port, char *name, int value) | |
2057 { | |
2058 XvAttribute *attributes; | |
12582 | 2059 int i, howmany, xv_atom; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2060 |
10359 | 2061 mp_dbg(MSGT_VO, MSGL_V, "xv_set_eq called! (%s, %d)\n", name, value); |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
2062 |
10359 | 2063 /* get available attributes */ |
2064 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2065 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2066 if (attributes[i].flags & XvSettable) |
2067 { | |
2068 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2069 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2070 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2071 if (xv_atom != None) |
2072 { | |
2073 int hue = 0, port_value, port_min, port_max; | |
10359 | 2074 |
12582 | 2075 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2076 (!strcasecmp(name, "brightness"))) | |
2077 port_value = value; | |
2078 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2079 (!strcasecmp(name, "contrast"))) | |
2080 port_value = value; | |
2081 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2082 (!strcasecmp(name, "saturation"))) | |
2083 port_value = value; | |
2084 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2085 (!strcasecmp(name, "hue"))) | |
2086 { | |
2087 port_value = value; | |
2088 hue = 1; | |
2089 } else | |
10359 | 2090 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2091 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2092 (!strcasecmp(name, "red_intensity"))) | |
2093 port_value = value; | |
2094 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2095 && (!strcasecmp(name, "green_intensity"))) | |
2096 port_value = value; | |
2097 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2098 && (!strcasecmp(name, "blue_intensity"))) | |
2099 port_value = value; | |
2100 else | |
2101 continue; | |
2102 | |
2103 port_min = attributes[i].min_value; | |
2104 port_max = attributes[i].max_value; | |
10359 | 2105 |
12582 | 2106 /* nvidia hue workaround */ |
2107 if (hue && port_min == 0 && port_max == 360) | |
2108 { | |
2109 port_value = | |
2110 (port_value >= | |
2111 0) ? (port_value - 100) : (port_value + 100); | |
10359 | 2112 } |
12582 | 2113 // -100 -> min |
2114 // 0 -> (max+min)/2 | |
2115 // +100 -> max | |
2116 port_value = | |
2117 (port_value + 100) * (port_max - port_min) / 200 + | |
2118 port_min; | |
2119 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value); | |
2120 return (VO_TRUE); | |
2121 } | |
2122 } | |
2123 return (VO_FALSE); | |
10359 | 2124 } |
2125 | |
2126 int vo_xv_get_eq(uint32_t xv_port, char *name, int *value) | |
2127 { | |
12582 | 2128 |
10359 | 2129 XvAttribute *attributes; |
12582 | 2130 int i, howmany, xv_atom; |
10359 | 2131 |
2132 /* get available attributes */ | |
2133 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
2134 for (i = 0; i < howmany && attributes; i++) | |
12582 | 2135 if (attributes[i].flags & XvGettable) |
2136 { | |
2137 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 2138 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
2139 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 2140 if (xv_atom != None) |
2141 { | |
2142 int val, port_value = 0, port_min, port_max; | |
10359 | 2143 |
12582 | 2144 XvGetPortAttribute(mDisplay, xv_port, xv_atom, |
2145 &port_value); | |
2146 | |
2147 port_min = attributes[i].min_value; | |
2148 port_max = attributes[i].max_value; | |
2149 val = | |
2150 (port_value - port_min) * 200 / (port_max - port_min) - | |
2151 100; | |
10359 | 2152 |
12582 | 2153 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
2154 (!strcasecmp(name, "brightness"))) | |
2155 *value = val; | |
2156 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
2157 (!strcasecmp(name, "contrast"))) | |
2158 *value = val; | |
2159 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
2160 (!strcasecmp(name, "saturation"))) | |
2161 *value = val; | |
2162 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
2163 (!strcasecmp(name, "hue"))) | |
2164 { | |
2165 /* nasty nvidia detect */ | |
2166 if (port_min == 0 && port_max == 360) | |
2167 *value = (val >= 0) ? (val - 100) : (val + 100); | |
2168 else | |
2169 *value = val; | |
2170 } else | |
10359 | 2171 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2172 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2173 (!strcasecmp(name, "red_intensity"))) | |
2174 *value = val; | |
2175 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2176 && (!strcasecmp(name, "green_intensity"))) | |
2177 *value = val; | |
2178 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2179 && (!strcasecmp(name, "blue_intensity"))) | |
2180 *value = val; | |
2181 else | |
2182 continue; | |
10359 | 2183 |
12582 | 2184 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", |
2185 name, *value); | |
2186 return (VO_TRUE); | |
2187 } | |
2188 } | |
2189 return (VO_FALSE); | |
10359 | 2190 } |
2191 | |
14742 | 2192 /** \brief contains flags changing the execution of the colorkeying code */ |
2193 xv_ck_info_t xv_ck_info = { CK_METHOD_MANUALFILL, CK_SRC_CUR }; | |
2194 unsigned long xv_colorkey; ///< The color used for manual colorkeying. | |
2195 unsigned int xv_port; ///< The selected Xv port. | |
2196 | |
2197 /** | |
2198 * \brief Interns the requested atom if it is available. | |
2199 * | |
2200 * \param atom_name String containing the name of the requested atom. | |
2201 * | |
2202 * \return Returns the atom if available, else None is returned. | |
2203 * | |
2204 */ | |
2205 static Atom xv_intern_atom_if_exists( char const * atom_name ) | |
2206 { | |
2207 XvAttribute * attributes; | |
2208 int attrib_count,i; | |
2209 Atom xv_atom = None; | |
2210 | |
2211 attributes = XvQueryPortAttributes( mDisplay, xv_port, &attrib_count ); | |
2212 if( attributes!=NULL ) | |
2213 { | |
2214 for ( i = 0; i < attrib_count; ++i ) | |
2215 { | |
2216 if ( strcmp(attributes[i].name, atom_name ) == 0 ) | |
2217 { | |
2218 xv_atom = XInternAtom( mDisplay, atom_name, False ); | |
2219 break; // found what we want, break out | |
2220 } | |
2221 } | |
2222 XFree( attributes ); | |
2223 } | |
2224 | |
2225 return xv_atom; | |
2226 } | |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2227 |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2228 /** |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2229 * \brief Try to enable vsync for xv. |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2230 * \return Returns -1 if not available, 0 on failure and 1 on success. |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2231 */ |
22886 | 2232 int vo_xv_enable_vsync(void) |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2233 { |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2234 Atom xv_atom = xv_intern_atom_if_exists("XV_SYNC_TO_VBLANK"); |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2235 if (xv_atom == None) |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2236 return -1; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2237 return XvSetPortAttribute(mDisplay, xv_port, xv_atom, 1) == Success; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2238 } |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2239 |
14742 | 2240 /** |
16958 | 2241 * \brief Get maximum supported source image dimensions. |
2242 * | |
2243 * This function does not set the variables pointed to by | |
21938 | 2244 * width and height if the information could not be retrieved, |
2245 * so the caller is reponsible for properly initializing them. | |
16958 | 2246 * |
2247 * \param width [out] The maximum width gets stored here. | |
2248 * \param height [out] The maximum height gets stored here. | |
2249 * | |
2250 */ | |
2251 void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ) | |
2252 { | |
2253 XvEncodingInfo * encodings; | |
2254 //unsigned long num_encodings, idx; to int or too long?! | |
2255 unsigned int num_encodings, idx; | |
2256 | |
2257 XvQueryEncodings( mDisplay, xv_port, &num_encodings, &encodings); | |
2258 | |
2259 if ( encodings ) | |
2260 { | |
2261 for ( idx = 0; idx < num_encodings; ++idx ) | |
2262 { | |
2263 if ( strcmp( encodings[idx].name, "XV_IMAGE" ) == 0 ) | |
2264 { | |
2265 *width = encodings[idx].width; | |
2266 *height = encodings[idx].height; | |
2267 break; | |
2268 } | |
2269 } | |
2270 } | |
2271 | |
2272 mp_msg( MSGT_VO, MSGL_V, | |
2273 "[xv common] Maximum source image dimensions: %ux%u\n", | |
2274 *width, *height ); | |
2275 | |
2276 XvFreeEncodingInfo( encodings ); | |
2277 } | |
2278 | |
2279 /** | |
14742 | 2280 * \brief Print information about the colorkey method and source. |
2281 * | |
2282 * \param ck_handling Integer value containing the information about | |
2283 * colorkey handling (see x11_common.h). | |
2284 * | |
2285 * Outputs the content of |ck_handling| as a readable message. | |
2286 * | |
2287 */ | |
22886 | 2288 void vo_xv_print_ck_info(void) |
14742 | 2289 { |
2290 mp_msg( MSGT_VO, MSGL_V, "[xv common] " ); | |
2291 | |
2292 switch ( xv_ck_info.method ) | |
2293 { | |
2294 case CK_METHOD_NONE: | |
2295 mp_msg( MSGT_VO, MSGL_V, "Drawing no colorkey.\n" ); return; | |
2296 case CK_METHOD_AUTOPAINT: | |
2297 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn by Xv." ); break; | |
2298 case CK_METHOD_MANUALFILL: | |
2299 mp_msg( MSGT_VO, MSGL_V, "Drawing colorkey manually." ); break; | |
2300 case CK_METHOD_BACKGROUND: | |
2301 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn as window background." ); break; | |
2302 } | |
2303 | |
2304 mp_msg( MSGT_VO, MSGL_V, "\n[xv common] " ); | |
2305 | |
2306 switch ( xv_ck_info.source ) | |
2307 { | |
2308 case CK_SRC_CUR: | |
17366 | 2309 mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n", |
14742 | 2310 xv_colorkey ); |
2311 break; | |
2312 case CK_SRC_USE: | |
2313 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2314 { | |
2315 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2316 "Ignoring colorkey from MPlayer (0x%06lx).\n", |
14742 | 2317 xv_colorkey ); |
2318 } | |
2319 else | |
2320 { | |
2321 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2322 "Using colorkey from MPlayer (0x%06lx)." |
14742 | 2323 " Use -colorkey to change.\n", |
2324 xv_colorkey ); | |
2325 } | |
2326 break; | |
2327 case CK_SRC_SET: | |
2328 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2329 "Setting and using colorkey from MPlayer (0x%06lx)." |
14742 | 2330 " Use -colorkey to change.\n", |
2331 xv_colorkey ); | |
2332 break; | |
2333 } | |
2334 } | |
2335 /** | |
2336 * \brief Init colorkey depending on the settings in xv_ck_info. | |
2337 * | |
2338 * \return Returns 0 on failure and 1 on success. | |
2339 * | |
2340 * Sets the colorkey variable according to the CK_SRC_* and CK_METHOD_* | |
2341 * flags in xv_ck_info. | |
2342 * | |
2343 * Possiblilities: | |
2344 * * Methods | |
2345 * - manual colorkey drawing ( CK_METHOD_MANUALFILL ) | |
2346 * - set colorkey as window background ( CK_METHOD_BACKGROUND ) | |
2347 * - let Xv paint the colorkey ( CK_METHOD_AUTOPAINT ) | |
2348 * * Sources | |
2349 * - use currently set colorkey ( CK_SRC_CUR ) | |
2350 * - use colorkey in vo_colorkey ( CK_SRC_USE ) | |
2351 * - use and set colorkey in vo_colorkey ( CK_SRC_SET ) | |
2352 * | |
2353 * NOTE: If vo_colorkey has bits set after the first 3 low order bytes | |
2354 * we don't draw anything as this means it was forced to off. | |
2355 */ | |
22886 | 2356 int vo_xv_init_colorkey(void) |
14742 | 2357 { |
2358 Atom xv_atom; | |
2359 int rez; | |
2360 | |
2361 /* check if colorkeying is needed */ | |
2362 xv_atom = xv_intern_atom_if_exists( "XV_COLORKEY" ); | |
2363 | |
2364 /* if we have to deal with colorkeying ... */ | |
2365 if( xv_atom != None && !(vo_colorkey & 0xFF000000) ) | |
2366 { | |
2367 /* check if we should use the colorkey specified in vo_colorkey */ | |
2368 if ( xv_ck_info.source != CK_SRC_CUR ) | |
2369 { | |
2370 xv_colorkey = vo_colorkey; | |
2371 | |
2372 /* check if we have to set the colorkey too */ | |
2373 if ( xv_ck_info.source == CK_SRC_SET ) | |
2374 { | |
2375 xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False); | |
2376 | |
2377 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, vo_colorkey ); | |
2378 if ( rez != Success ) | |
2379 { | |
2380 mp_msg( MSGT_VO, MSGL_FATAL, | |
2381 "[xv common] Couldn't set colorkey!\n" ); | |
2382 return 0; // error setting colorkey | |
2383 } | |
2384 } | |
2385 } | |
2386 else | |
2387 { | |
2388 int colorkey_ret; | |
2389 | |
2390 rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey_ret); | |
2391 if ( rez == Success ) | |
2392 { | |
2393 xv_colorkey = colorkey_ret; | |
2394 } | |
2395 else | |
2396 { | |
2397 mp_msg( MSGT_VO, MSGL_FATAL, | |
2398 "[xv common] Couldn't get colorkey!" | |
2399 "Maybe the selected Xv port has no overlay.\n" ); | |
2400 return 0; // error getting colorkey | |
2401 } | |
2402 } | |
2403 | |
15186 | 2404 xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" ); |
2405 | |
14742 | 2406 /* should we draw the colorkey ourselves or activate autopainting? */ |
2407 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2408 { | |
2409 rez = !Success; // reset rez to something different than Success | |
2410 | |
2411 if ( xv_atom != None ) // autopaint is supported | |
2412 { | |
2413 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, 1 ); | |
2414 } | |
2415 | |
2416 if ( rez != Success ) | |
2417 { | |
2418 // fallback to manual colorkey drawing | |
2419 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2420 } | |
2421 } | |
15186 | 2422 else // disable colorkey autopainting if supported |
2423 { | |
2424 if ( xv_atom != None ) // we have autopaint attribute | |
2425 { | |
2426 XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 ); | |
2427 } | |
2428 } | |
14742 | 2429 } |
2430 else // do no colorkey drawing at all | |
2431 { | |
2432 xv_ck_info.method = CK_METHOD_NONE; | |
2433 } /* end: should we draw colorkey */ | |
2434 | |
21938 | 2435 /* output information about the current colorkey settings */ |
14742 | 2436 vo_xv_print_ck_info(); |
2437 | |
2438 return 1; // success | |
2439 } | |
2440 | |
2441 /** | |
2442 * \brief Draw the colorkey on the video window. | |
2443 * | |
2444 * Draws the colorkey depending on the set method ( colorkey_handling ). | |
2445 * | |
21938 | 2446 * Also draws the black bars ( when the video doesn't fit the display in |
2447 * fullscreen ) separately, so they don't overlap with the video area. | |
2448 * It doesn't call XFlush. | |
14742 | 2449 * |
2450 */ | |
24890 | 2451 void vo_xv_draw_colorkey( int32_t x, int32_t y, |
15100 | 2452 int32_t w, int32_t h ) |
14742 | 2453 { |
15100 | 2454 if( xv_ck_info.method == CK_METHOD_MANUALFILL || |
2455 xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow() | |
14742 | 2456 { |
2457 XSetForeground( mDisplay, vo_gc, xv_colorkey ); | |
2458 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2459 x, y, | |
2460 w, h ); | |
2461 } | |
2462 | |
2463 /* draw black bars if needed */ | |
15100 | 2464 /* TODO! move this to vo_x11_clearwindow_part() */ |
14742 | 2465 if ( vo_fs ) |
2466 { | |
2467 XSetForeground( mDisplay, vo_gc, 0 ); | |
21938 | 2468 /* making non-overlap fills, requires 8 checks instead of 4 */ |
14742 | 2469 if ( y > 0 ) |
2470 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2471 0, 0, | |
2472 vo_screenwidth, y); | |
2473 if (x > 0) | |
2474 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2475 0, 0, |
2476 x, vo_screenheight); | |
14742 | 2477 if (x + w < vo_screenwidth) |
2478 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2479 x + w, 0, |
2480 vo_screenwidth, vo_screenheight); | |
14742 | 2481 if (y + h < vo_screenheight) |
2482 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2483 0, y + h, | |
15100 | 2484 vo_screenwidth, vo_screenheight); |
14742 | 2485 } |
2486 } | |
2487 | |
21938 | 2488 /** \brief Tests if a valid argument for the ck suboption was given. */ |
14742 | 2489 int xv_test_ck( void * arg ) |
2490 { | |
2491 strarg_t * strarg = (strarg_t *)arg; | |
2492 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2493 if ( strargcmp( strarg, "use" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2494 strargcmp( strarg, "set" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2495 strargcmp( strarg, "cur" ) == 0 ) |
14742 | 2496 { |
2497 return 1; | |
2498 } | |
2499 | |
2500 return 0; | |
2501 } | |
21938 | 2502 /** \brief Tests if a valid arguments for the ck-method suboption was given. */ |
14742 | 2503 int xv_test_ckm( void * arg ) |
2504 { | |
2505 strarg_t * strarg = (strarg_t *)arg; | |
2506 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2507 if ( strargcmp( strarg, "bg" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2508 strargcmp( strarg, "man" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2509 strargcmp( strarg, "auto" ) == 0 ) |
14742 | 2510 { |
2511 return 1; | |
2512 } | |
2513 | |
2514 return 0; | |
2515 } | |
2516 | |
2517 /** | |
2518 * \brief Modify the colorkey_handling var according to str | |
2519 * | |
2520 * Checks if a valid pointer ( not NULL ) to the string | |
2521 * was given. And in that case modifies the colorkey_handling | |
2522 * var to reflect the requested behaviour. | |
2523 * If nothing happens the content of colorkey_handling stays | |
2524 * the same. | |
2525 * | |
2526 * \param str Pointer to the string or NULL | |
2527 * | |
2528 */ | |
2529 void xv_setup_colorkeyhandling( char const * ck_method_str, | |
2530 char const * ck_str ) | |
2531 { | |
2532 /* check if a valid pointer to the string was passed */ | |
2533 if ( ck_str ) | |
2534 { | |
2535 if ( strncmp( ck_str, "use", 3 ) == 0 ) | |
2536 { | |
2537 xv_ck_info.source = CK_SRC_USE; | |
2538 } | |
2539 else if ( strncmp( ck_str, "set", 3 ) == 0 ) | |
2540 { | |
2541 xv_ck_info.source = CK_SRC_SET; | |
2542 } | |
2543 } | |
2544 /* check if a valid pointer to the string was passed */ | |
2545 if ( ck_method_str ) | |
2546 { | |
2547 if ( strncmp( ck_method_str, "bg", 2 ) == 0 ) | |
2548 { | |
2549 xv_ck_info.method = CK_METHOD_BACKGROUND; | |
2550 } | |
2551 else if ( strncmp( ck_method_str, "man", 3 ) == 0 ) | |
2552 { | |
2553 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2554 } | |
2555 else if ( strncmp( ck_method_str, "auto", 4 ) == 0 ) | |
2556 { | |
2557 xv_ck_info.method = CK_METHOD_AUTOPAINT; | |
2558 } | |
2559 } | |
2560 } | |
2561 | |
10359 | 2562 #endif |