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