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