Mercurial > mplayer.hg
annotate libvo/x11_common.c @ 28135:31ea1d682c7b
Use a table to translate X11 to MPlayer keycodes.
author | reimar |
---|---|
date | Sat, 20 Dec 2008 11:12:45 +0000 |
parents | 272238675b78 |
children | 28bf0d126da2 |
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 |
28135 | 583 struct { |
584 int x11key; | |
585 int mpkey; | |
586 } static const keymap[] = { | |
587 // special keys | |
588 {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS}, {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER}, | |
589 | |
590 // cursor keys | |
591 {wsLeft, KEY_LEFT}, {wsRight, KEY_RIGHT}, {wsUp, KEY_UP}, {wsDown, KEY_DOWN}, | |
592 | |
593 // navigation block | |
594 {wsInsert, KEY_INSERT}, {wsDelete, KEY_DELETE}, {wsHome, KEY_HOME}, {wsEnd, KEY_END}, | |
595 {wsPageUp, KEY_PAGE_UP}, {wsPageDown, KEY_PAGE_DOWN}, | |
596 | |
597 // F-keys | |
598 {wsF1, KEY_F+1}, {wsF2, KEY_F+2}, {wsF3, KEY_F+3}, {wsF4, KEY_F+4}, | |
599 {wsF5, KEY_F+5}, {wsF6, KEY_F+6}, {wsF7, KEY_F+7}, {wsF8, KEY_F+8}, | |
600 {wsF9, KEY_F+9}, {wsF10, KEY_F+10}, {wsF11, KEY_F+11}, {wsF12, KEY_F+12}, | |
601 | |
602 // numpad independent of numlock | |
603 {wsGrayMinus, '-'}, {wsGrayPlus, '+'}, {wsGrayMul, '*'}, {wsGrayDiv, '/'}, | |
604 {wsGrayEnter, KEY_KPENTER}, | |
605 | |
606 // numpad with numlock | |
607 {wsGray0, KEY_KP0}, {wsGray1, KEY_KP1}, {wsGray2, KEY_KP2}, | |
608 {wsGray3, KEY_KP3}, {wsGray4, KEY_KP4}, {wsGray5, KEY_KP5}, | |
609 {wsGray6, KEY_KP6}, {wsGray7, KEY_KP7}, {wsGray8, KEY_KP8}, | |
610 {wsGray9, KEY_KP9}, {wsGrayDecimal, KEY_KPDEC}, | |
611 | |
612 // numpad without numlock | |
613 {wsGrayInsert, KEY_KPINS}, {wsGrayEnd, KEY_KP1}, {wsGrayDown, KEY_KP2}, | |
614 {wsGrayPgDn, KEY_KP3}, {wsGrayLeft, KEY_KP4}, {wsGray5Dup, KEY_KP5}, | |
615 {wsGrayRight, KEY_KP6}, {wsGrayHome, KEY_KP7}, {wsGrayUp, KEY_KP8}, | |
616 {wsGrayPgUp, KEY_KP9}, {wsGrayDelete, KEY_KPDEL}, | |
617 | |
618 {0, 0} | |
619 }; | |
620 | |
12582 | 621 void vo_x11_putkey(int key) |
622 { | |
28133
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
623 static const char *passthrough_keys = " -+*/<>`~!@#$%^&()_{}:;\"\',.?\\|=[]"; |
28135 | 624 int mpkey = 0; |
625 int i; | |
28133
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
626 if ((key >= 'a' && key <= 'z') || |
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
627 (key >= 'A' && key <= 'Z') || |
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
628 (key >= '0' && key <= '9') || |
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
629 (key > 0 && key < 256 && strchr(passthrough_keys, key))) |
28135 | 630 mpkey = key; |
28133
272238675b78
Simplify handling of X11 key events that are just passed through.
reimar
parents:
28063
diff
changeset
|
631 |
28135 | 632 for (i = 0; !mpkey && keymap[i].x11key; i++) |
633 if (keymap[i].x11key == key) | |
634 mpkey = keymap[i].mpkey; | |
369 | 635 |
28135 | 636 if (mpkey) |
637 mplayer_put_key(mpkey); | |
32 | 638 } |
639 | |
640 | |
641 // ----- Motif header: ------- | |
642 | |
1236 | 643 #define MWM_HINTS_FUNCTIONS (1L << 0) |
644 #define MWM_HINTS_DECORATIONS (1L << 1) | |
645 #define MWM_HINTS_INPUT_MODE (1L << 2) | |
646 #define MWM_HINTS_STATUS (1L << 3) | |
647 | |
648 #define MWM_FUNC_ALL (1L << 0) | |
649 #define MWM_FUNC_RESIZE (1L << 1) | |
650 #define MWM_FUNC_MOVE (1L << 2) | |
651 #define MWM_FUNC_MINIMIZE (1L << 3) | |
652 #define MWM_FUNC_MAXIMIZE (1L << 4) | |
653 #define MWM_FUNC_CLOSE (1L << 5) | |
654 | |
655 #define MWM_DECOR_ALL (1L << 0) | |
656 #define MWM_DECOR_BORDER (1L << 1) | |
657 #define MWM_DECOR_RESIZEH (1L << 2) | |
658 #define MWM_DECOR_TITLE (1L << 3) | |
659 #define MWM_DECOR_MENU (1L << 4) | |
660 #define MWM_DECOR_MINIMIZE (1L << 5) | |
661 #define MWM_DECOR_MAXIMIZE (1L << 6) | |
662 | |
663 #define MWM_INPUT_MODELESS 0 | |
664 #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 | |
665 #define MWM_INPUT_SYSTEM_MODAL 2 | |
666 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 | |
667 #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL | |
668 | |
669 #define MWM_TEAROFF_WINDOW (1L<<0) | |
32 | 670 |
671 typedef struct | |
672 { | |
12582 | 673 long flags; |
674 long functions; | |
675 long decorations; | |
676 long input_mode; | |
677 long state; | |
32 | 678 } MotifWmHints; |
679 | |
12582 | 680 static MotifWmHints vo_MotifWmHints; |
681 static Atom vo_MotifHints = None; | |
32 | 682 |
12582 | 683 void vo_x11_decoration(Display * vo_Display, Window w, int d) |
32 | 684 { |
12582 | 685 static unsigned int olddecor = MWM_DECOR_ALL; |
686 static unsigned int oldfuncs = | |
687 MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | | |
688 MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; | |
689 Atom mtype; | |
690 int mformat; | |
691 unsigned long mn, mb; | |
692 | |
693 if (!WinID) | |
694 return; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5919
diff
changeset
|
695 |
12582 | 696 if (vo_fsmode & 8) |
697 { | |
698 XSetTransientForHint(vo_Display, w, | |
699 RootWindow(vo_Display, mScreen)); | |
700 } | |
701 | |
702 vo_MotifHints = XInternAtom(vo_Display, "_MOTIF_WM_HINTS", 0); | |
703 if (vo_MotifHints != None) | |
704 { | |
705 if (!d) | |
706 { | |
707 MotifWmHints *mhints = NULL; | |
1415 | 708 |
12582 | 709 XGetWindowProperty(vo_Display, w, vo_MotifHints, 0, 20, False, |
710 vo_MotifHints, &mtype, &mformat, &mn, | |
711 &mb, (unsigned char **) &mhints); | |
712 if (mhints) | |
713 { | |
714 if (mhints->flags & MWM_HINTS_DECORATIONS) | |
715 olddecor = mhints->decorations; | |
716 if (mhints->flags & MWM_HINTS_FUNCTIONS) | |
717 oldfuncs = mhints->functions; | |
718 XFree(mhints); | |
719 } | |
720 } | |
12096 | 721 |
12582 | 722 memset(&vo_MotifWmHints, 0, sizeof(MotifWmHints)); |
723 vo_MotifWmHints.flags = | |
724 MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; | |
725 if (d) | |
726 { | |
727 vo_MotifWmHints.functions = oldfuncs; | |
728 d = olddecor; | |
729 } | |
4993 | 730 #if 0 |
12582 | 731 vo_MotifWmHints.decorations = |
732 d | ((vo_fsmode & 2) ? 0 : MWM_DECOR_MENU); | |
4993 | 733 #else |
12582 | 734 vo_MotifWmHints.decorations = |
735 d | ((vo_fsmode & 2) ? MWM_DECOR_MENU : 0); | |
4993 | 736 #endif |
12582 | 737 XChangeProperty(vo_Display, w, vo_MotifHints, vo_MotifHints, 32, |
738 PropModeReplace, | |
739 (unsigned char *) &vo_MotifWmHints, | |
740 (vo_fsmode & 4) ? 4 : 5); | |
741 } | |
32 | 742 } |
743 | |
12582 | 744 void vo_x11_classhint(Display * display, Window window, char *name) |
745 { | |
746 XClassHint wmClass; | |
747 pid_t pid = getpid(); | |
748 | |
749 wmClass.res_name = name; | |
750 wmClass.res_class = "MPlayer"; | |
751 XSetClassHint(display, window, &wmClass); | |
752 XChangeProperty(display, window, XA_NET_WM_PID, XA_CARDINAL, 32, | |
753 PropModeReplace, (unsigned char *) &pid, 1); | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
754 } |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
755 |
12582 | 756 Window vo_window = None; |
757 GC vo_gc = NULL; | |
758 GC f_gc = NULL; | |
4993 | 759 XSizeHints vo_hint; |
4795 | 760 |
27343 | 761 #ifdef CONFIG_GUI |
12582 | 762 void vo_setwindow(Window w, GC g) |
763 { | |
764 vo_window = w; | |
765 vo_gc = g; | |
766 } | |
723 | 767 #endif |
768 | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17366
diff
changeset
|
769 void vo_x11_uninit(void) |
4437 | 770 { |
7111 | 771 saver_on(mDisplay); |
12582 | 772 if (vo_window != None) |
773 vo_showcursor(mDisplay, vo_window); | |
4742 | 774 |
12582 | 775 if (f_gc) |
776 { | |
777 XFreeGC(mDisplay, f_gc); | |
778 f_gc = NULL; | |
779 } | |
27343 | 780 #ifdef CONFIG_GUI |
21938 | 781 /* destroy window only if it's not controlled by the GUI */ |
12582 | 782 if (!use_gui) |
4437 | 783 #endif |
784 { | |
12582 | 785 if (vo_gc) |
786 { | |
787 XSetBackground(mDisplay, vo_gc, 0); | |
788 XFreeGC(mDisplay, vo_gc); | |
789 vo_gc = NULL; | |
790 } | |
791 if (vo_window != None) | |
792 { | |
793 XClearWindow(mDisplay, vo_window); | |
794 if (WinID < 0) | |
795 { | |
796 XEvent xev; | |
797 | |
798 XUnmapWindow(mDisplay, vo_window); | |
799 XDestroyWindow(mDisplay, vo_window); | |
800 do | |
801 { | |
802 XNextEvent(mDisplay, &xev); | |
803 } | |
804 while (xev.type != DestroyNotify | |
805 || xev.xdestroywindow.event != vo_window); | |
806 } | |
807 vo_window = None; | |
808 } | |
809 vo_fs = 0; | |
810 vo_old_width = vo_old_height = 0; | |
4437 | 811 } |
812 } | |
813 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
814 static unsigned int mouse_timer; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
815 static int mouse_waiting_hide; |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
816 |
12582 | 817 int vo_x11_check_events(Display * mydisplay) |
818 { | |
819 int ret = 0; | |
820 XEvent Event; | |
821 char buf[100]; | |
822 KeySym keySym; | |
823 static XComposeStatus stat; | |
5651
b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents:
5538
diff
changeset
|
824 |
32 | 825 // unsigned long vo_KeyTable[512]; |
826 | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
827 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
|
828 (GetTimerMS() - mouse_timer >= 1000)) { |
12582 | 829 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
|
830 mouse_waiting_hide = 0; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
831 } |
6095 | 832 |
12582 | 833 while (XPending(mydisplay)) |
834 { | |
835 XNextEvent(mydisplay, &Event); | |
27343 | 836 #ifdef CONFIG_GUI |
12582 | 837 if (use_gui) |
838 { | |
839 guiGetEvent(0, (char *) &Event); | |
840 if (vo_window != Event.xany.window) | |
841 continue; | |
842 } | |
843 #endif | |
6095 | 844 // printf("\rEvent.type=%X \n",Event.type); |
12582 | 845 switch (Event.type) |
846 { | |
847 case Expose: | |
848 ret |= VO_EVENT_EXPOSE; | |
849 break; | |
850 case ConfigureNotify: | |
851 // if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break; | |
852 // if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break; | |
853 if (vo_window == None) | |
854 break; | |
27885
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
855 vo_x11_update_geometry(); |
12582 | 856 ret |= VO_EVENT_RESIZE; |
857 break; | |
858 case KeyPress: | |
859 { | |
860 int key; | |
861 | |
27343 | 862 #ifdef CONFIG_GUI |
14001 | 863 if ( use_gui ) { break; } |
864 #endif | |
865 | |
12582 | 866 XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, |
867 &stat); | |
868 #ifdef XF86XK_AudioPause | |
869 vo_x11_putkey_ext(keySym); | |
870 #endif | |
871 key = | |
872 ((keySym & 0xff00) != | |
873 0 ? ((keySym & 0x00ff) + 256) : (keySym)); | |
874 vo_x11_putkey(key); | |
875 ret |= VO_EVENT_KEYPRESS; | |
876 } | |
877 break; | |
878 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
|
879 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
|
880 { |
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
|
881 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
|
882 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
|
883 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
|
884 } |
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
|
885 |
12582 | 886 if (vo_mouse_autohide) |
887 { | |
888 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
|
889 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
890 mouse_timer = GetTimerMS(); |
12582 | 891 } |
892 break; | |
893 case ButtonPress: | |
894 if (vo_mouse_autohide) | |
895 { | |
896 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
|
897 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
898 mouse_timer = GetTimerMS(); |
12582 | 899 } |
27343 | 900 #ifdef CONFIG_GUI |
21938 | 901 // Ignore mouse button 1-3 under GUI. |
12582 | 902 if (use_gui && (Event.xbutton.button >= 1) |
903 && (Event.xbutton.button <= 3)) | |
904 break; | |
905 #endif | |
906 mplayer_put_key((MOUSE_BTN0 + Event.xbutton.button - | |
907 1) | MP_KEY_DOWN); | |
908 break; | |
909 case ButtonRelease: | |
910 if (vo_mouse_autohide) | |
911 { | |
912 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
|
913 mouse_waiting_hide = 1; |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18237
diff
changeset
|
914 mouse_timer = GetTimerMS(); |
12582 | 915 } |
27343 | 916 #ifdef CONFIG_GUI |
21938 | 917 // Ignore mouse button 1-3 under GUI. |
12582 | 918 if (use_gui && (Event.xbutton.button >= 1) |
919 && (Event.xbutton.button <= 3)) | |
920 break; | |
921 #endif | |
922 mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); | |
923 break; | |
924 case PropertyNotify: | |
925 { | |
926 char *name = | |
927 XGetAtomName(mydisplay, Event.xproperty.atom); | |
928 | |
929 if (!name) | |
930 break; | |
931 | |
6046 | 932 // fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); |
12582 | 933 |
934 XFree(name); | |
935 } | |
936 break; | |
937 case MapNotify: | |
938 vo_hint.win_gravity = old_gravity; | |
939 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
940 vo_fs_flip = 0; | |
941 break; | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
942 case ClientMessage: |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
943 if (Event.xclient.message_type == XAWM_PROTOCOLS && |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
944 Event.xclient.data.l[0] == XAWM_DELETE_WINDOW) |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
945 mplayer_put_key(KEY_CLOSE_WIN); |
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
946 break; |
12582 | 947 } |
948 } | |
949 return ret; | |
32 | 950 } |
951 | |
13843 | 952 /** |
953 * \brief sets the size and position of the non-fullscreen window. | |
954 */ | |
955 void vo_x11_nofs_sizepos(int x, int y, int width, int height) | |
956 { | |
24312
716b7751e7ad
Make sure aspect hint is adjusted on aspect change
reimar
parents:
24311
diff
changeset
|
957 vo_x11_sizehint(x, y, width, height, 0); |
13843 | 958 if (vo_fs) { |
959 vo_old_x = x; | |
960 vo_old_y = y; | |
961 vo_old_width = width; | |
962 vo_old_height = height; | |
963 } | |
964 else | |
13871 | 965 { |
966 vo_dwidth = width; | |
967 vo_dheight = height; | |
13843 | 968 XMoveResizeWindow(mDisplay, vo_window, x, y, width, height); |
13871 | 969 } |
13843 | 970 } |
971 | |
12582 | 972 void vo_x11_sizehint(int x, int y, int width, int height, int max) |
4993 | 973 { |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
974 vo_hint.flags = 0; |
12582 | 975 if (vo_keepaspect) |
976 { | |
977 vo_hint.flags |= PAspect; | |
978 vo_hint.min_aspect.x = width; | |
979 vo_hint.min_aspect.y = height; | |
980 vo_hint.max_aspect.x = width; | |
981 vo_hint.max_aspect.y = height; | |
982 } | |
8692
604f0cde816c
X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents:
8676
diff
changeset
|
983 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
984 vo_hint.flags |= PPosition | PSize; |
12582 | 985 vo_hint.x = x; |
986 vo_hint.y = y; | |
987 vo_hint.width = width; | |
988 vo_hint.height = height; | |
989 if (max) | |
990 { | |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
991 vo_hint.flags |= PMaxSize; |
12582 | 992 vo_hint.max_width = width; |
993 vo_hint.max_height = height; | |
994 } else | |
995 { | |
996 vo_hint.max_width = 0; | |
997 vo_hint.max_height = 0; | |
998 } | |
11995 | 999 |
21938 | 1000 // Set minimum height/width to 4 to avoid off-by-one errors |
1001 // 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
|
1002 vo_hint.flags |= PMinSize; |
12582 | 1003 vo_hint.min_width = vo_hint.min_height = 4; |
11995 | 1004 |
28063
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1005 // 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
|
1006 // 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
|
1007 // 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
|
1008 vo_hint.flags |= PBaseSize; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1009 vo_hint.base_width = 0 /*width*/; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1010 vo_hint.base_height = 0 /*height*/; |
a318969a4f45
Set the base size window manager hint, otherwise some subtract the minimum
reimar
parents:
27927
diff
changeset
|
1011 |
24311
0ff0253c8e00
Cosmetics: set vo_hint.flags at more consistent places (directly before
reimar
parents:
23875
diff
changeset
|
1012 vo_hint.flags |= PWinGravity; |
12582 | 1013 vo_hint.win_gravity = StaticGravity; |
1014 XSetWMNormalHints(mDisplay, vo_window, &vo_hint); | |
4993 | 1015 } |
1016 | |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1017 static int vo_x11_get_gnome_layer(Display * mDisplay, Window win) |
8866 | 1018 { |
12582 | 1019 Atom type; |
1020 int format; | |
1021 unsigned long nitems; | |
1022 unsigned long bytesafter; | |
1023 unsigned short *args = NULL; | |
8866 | 1024 |
12582 | 1025 if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384, |
1026 False, AnyPropertyType, &type, &format, &nitems, | |
1027 &bytesafter, | |
1028 (unsigned char **) &args) == Success | |
1029 && nitems > 0 && args) | |
1030 { | |
1031 mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n", | |
1032 *args); | |
1033 return *args; | |
1034 } | |
1035 return WIN_LAYER_NORMAL; | |
8866 | 1036 } |
1037 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1038 // |
12582 | 1039 Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot, |
1040 Visual * vis, int x, int y, | |
1041 unsigned int width, unsigned int height, | |
1042 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
|
1043 { |
27815
f92271dc5f17
Remove X11 backing store: this is now a useless flag.
ben
parents:
27713
diff
changeset
|
1044 unsigned long xswamask = CWBorderPixel; |
12582 | 1045 XSetWindowAttributes xswa; |
1046 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
|
1047 |
12582 | 1048 if (col_map != CopyFromParent) |
1049 { | |
1050 xswa.colormap = col_map; | |
1051 xswamask |= CWColormap; | |
1052 } | |
1053 xswa.background_pixel = 0; | |
1054 xswa.border_pixel = 0; | |
27815
f92271dc5f17
Remove X11 backing store: this is now a useless flag.
ben
parents:
27713
diff
changeset
|
1055 xswa.backing_store = NotUseful; |
12582 | 1056 xswa.bit_gravity = StaticGravity; |
1057 | |
1058 ret_win = | |
1059 XCreateWindow(mDisplay, mRootWin, x, y, width, height, 0, depth, | |
1060 CopyFromParent, vis, xswamask, &xswa); | |
18149
163fe5c2577d
Register for window-manager delete window events and quit MPlayer.
reimar
parents:
18116
diff
changeset
|
1061 XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1); |
12582 | 1062 if (!f_gc) |
1063 f_gc = XCreateGC(mDisplay, ret_win, 0, 0); | |
1064 XSetForeground(mDisplay, f_gc, 0); | |
1065 | |
1066 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
|
1067 } |
12582 | 1068 |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1069 /** |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1070 * \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
|
1071 * \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
|
1072 * \param x x position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1073 * \param y y position of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1074 * \param width width of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1075 * \param height height of window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1076 * \param flags flags for window creation. |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1077 * Only VOFLAG_FULLSCREEN is supported so far. |
23823
513293585949
document "default" behaviour if CopyFromParent is passed as colormap
attila
parents:
23660
diff
changeset
|
1078 * \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
|
1079 * \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
|
1080 * \param title title for the window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1081 * |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1082 * 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
|
1083 * 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
|
1084 */ |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1085 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
|
1086 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
|
1087 Colormap col_map, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1088 const char *classname, const char *title) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1089 { |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1090 XGCValues xgcv; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1091 if (WinID >= 0) { |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1092 vo_window = WinID ? (Window)WinID : mRootWin; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1093 if (col_map != CopyFromParent) { |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1094 unsigned long xswamask = CWColormap; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1095 XSetWindowAttributes xswa; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1096 xswa.colormap = col_map; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1097 XUnmapWindow(mDisplay, vo_window); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1098 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1099 XMapWindow(mDisplay, vo_window); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1100 } |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1101 if (WinID) vo_x11_update_geometry(); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1102 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
|
1103 StructureNotifyMask | KeyPressMask | PointerMotionMask | |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1104 ButtonPressMask | ButtonReleaseMask | ExposureMask); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1105 goto final; |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1106 } |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1107 if (vo_window == None) { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1108 XSizeHints hint; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1109 XEvent xev; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1110 vo_fs = 0; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1111 vo_dwidth = width; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1112 vo_dheight = height; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1113 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
|
1114 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
|
1115 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
|
1116 XStoreName(mDisplay, vo_window, title); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1117 vo_hidecursor(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1118 XSelectInput(mDisplay, vo_window, StructureNotifyMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1119 hint.x = x; hint.y = y; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1120 hint.width = width; hint.height = height; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1121 hint.flags = PPosition | PSize; |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1122 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
|
1123 vo_x11_sizehint(x, y, width, height, 0); |
27304 | 1124 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
|
1125 // map window |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1126 XMapWindow(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1127 XClearWindow(mDisplay, vo_window); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1128 // wait for map |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1129 do { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1130 XNextEvent(mDisplay, &xev); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1131 } 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
|
1132 XSelectInput(mDisplay, vo_window, NoEventMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1133 XSync(mDisplay, False); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1134 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
|
1135 StructureNotifyMask | KeyPressMask | PointerMotionMask | |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1136 ButtonPressMask | ButtonReleaseMask | ExposureMask); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1137 } |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1138 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
|
1139 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
|
1140 if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN)) |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1141 vo_x11_fullscreen(); |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1142 final: |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1143 if (vo_gc != None) |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1144 XFreeGC(mDisplay, vo_gc); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1145 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
|
1146 XSync(mDisplay, False); |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27893
diff
changeset
|
1147 vo_mouse_autohide = 1; |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23615
diff
changeset
|
1148 } |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1149 |
12582 | 1150 void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window, |
1151 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
|
1152 { |
12582 | 1153 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
|
1154 |
12582 | 1155 if (!f_gc) |
1156 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
|
1157 |
12582 | 1158 u_dheight = use_fs ? vo_screenheight : vo_dheight; |
1159 u_dwidth = use_fs ? vo_screenwidth : vo_dwidth; | |
1160 if ((u_dheight <= img_height) && (u_dwidth <= img_width)) | |
1161 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
|
1162 |
12582 | 1163 left_ov = (u_dheight - img_height) / 2; |
1164 left_ov2 = (u_dwidth - img_width) / 2; | |
1165 | |
1166 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov); | |
1167 XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1, | |
1168 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
|
1169 |
12582 | 1170 if (u_dwidth > img_width) |
1171 { | |
1172 XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2, | |
1173 img_height); | |
1174 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
|
1175 left_ov, left_ov2 + 1, img_height); |
12582 | 1176 } |
1177 | |
1178 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
|
1179 } |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1180 |
12582 | 1181 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
|
1182 { |
12582 | 1183 if (!f_gc) |
1184 return; | |
1185 XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth, | |
1186 vo_screenheight); | |
1187 // | |
1188 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
|
1189 } |
12582 | 1190 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10754
diff
changeset
|
1191 |
12582 | 1192 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
|
1193 { |
12582 | 1194 if (WinID >= 0) |
1195 return; | |
8864 | 1196 |
12582 | 1197 if (vo_fs_type & vo_wm_LAYER) |
1198 { | |
1199 XClientMessageEvent xev; | |
1200 | |
1201 if (!orig_layer) | |
1202 orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window); | |
8866 | 1203 |
12582 | 1204 memset(&xev, 0, sizeof(xev)); |
1205 xev.type = ClientMessage; | |
1206 xev.display = mDisplay; | |
1207 xev.window = vo_window; | |
1208 xev.message_type = XA_WIN_LAYER; | |
1209 xev.format = 32; | |
1210 xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer | |
1211 xev.data.l[1] = CurrentTime; | |
1212 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1213 "[x11] Layered style stay on top (layer %ld).\n", |
12582 | 1214 xev.data.l[0]); |
1215 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, | |
1216 (XEvent *) & xev); | |
1217 } else if (vo_fs_type & vo_wm_NETWM) | |
1218 { | |
1219 XClientMessageEvent xev; | |
1220 char *state; | |
8645 | 1221 |
12582 | 1222 memset(&xev, 0, sizeof(xev)); |
1223 xev.type = ClientMessage; | |
1224 xev.message_type = XA_NET_WM_STATE; | |
1225 xev.display = mDisplay; | |
1226 xev.window = vo_window; | |
1227 xev.format = 32; | |
1228 xev.data.l[0] = layer; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1229 |
12582 | 1230 if (vo_fs_type & vo_wm_STAYS_ON_TOP) |
1231 xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP; | |
1232 else if (vo_fs_type & vo_wm_ABOVE) | |
1233 xev.data.l[1] = XA_NET_WM_STATE_ABOVE; | |
1234 else if (vo_fs_type & vo_wm_FULLSCREEN) | |
1235 xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN; | |
1236 else if (vo_fs_type & vo_wm_BELOW) | |
21938 | 1237 // This is not fallback. We can safely assume that the situation |
1238 // where only NETWM_STATE_BELOW is supported doesn't exist. | |
12582 | 1239 xev.data.l[1] = XA_NET_WM_STATE_BELOW; |
1240 | |
1241 XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask, | |
1242 (XEvent *) & xev); | |
1243 state = XGetAtomName(mDisplay, xev.data.l[1]); | |
1244 mp_msg(MSGT_VO, MSGL_V, | |
1245 "[x11] NET style stay on top (layer %d). Using state %s.\n", | |
1246 layer, state); | |
1247 XFree(state); | |
1248 } | |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1249 } |
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5981
diff
changeset
|
1250 |
10587
382bf4771ee7
moved lot of global variables into static ones (and some minor spelling fixes)
alex
parents:
10570
diff
changeset
|
1251 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
|
1252 { |
12582 | 1253 int i; |
1254 int type = supported; | |
1255 | |
1256 if (vo_fstype_list) | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1257 { |
12582 | 1258 i = 0; |
1259 for (i = 0; vo_fstype_list[i]; i++) | |
1260 { | |
1261 int neg = 0; | |
1262 char *arg = vo_fstype_list[i]; | |
1263 | |
1264 if (vo_fstype_list[i][0] == '-') | |
1265 { | |
1266 neg = 1; | |
1267 arg = vo_fstype_list[i] + 1; | |
1268 } | |
1269 | |
1270 if (!strncmp(arg, "layer", 5)) | |
1271 { | |
1272 if (!neg && (arg[5] == '=')) | |
1273 { | |
1274 char *endptr = NULL; | |
1275 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
|
1276 |
12582 | 1277 if (endptr && *endptr == '\0' && layer >= 0 |
1278 && layer <= 15) | |
1279 fs_layer = layer; | |
1280 } | |
1281 if (neg) | |
1282 type &= ~vo_wm_LAYER; | |
1283 else | |
1284 type |= vo_wm_LAYER; | |
1285 } else if (!strcmp(arg, "above")) | |
1286 { | |
1287 if (neg) | |
1288 type &= ~vo_wm_ABOVE; | |
1289 else | |
1290 type |= vo_wm_ABOVE; | |
1291 } else if (!strcmp(arg, "fullscreen")) | |
1292 { | |
1293 if (neg) | |
1294 type &= ~vo_wm_FULLSCREEN; | |
1295 else | |
1296 type |= vo_wm_FULLSCREEN; | |
1297 } else if (!strcmp(arg, "stays_on_top")) | |
1298 { | |
1299 if (neg) | |
1300 type &= ~vo_wm_STAYS_ON_TOP; | |
1301 else | |
1302 type |= vo_wm_STAYS_ON_TOP; | |
1303 } else if (!strcmp(arg, "below")) | |
1304 { | |
1305 if (neg) | |
1306 type &= ~vo_wm_BELOW; | |
1307 else | |
1308 type |= vo_wm_BELOW; | |
1309 } else if (!strcmp(arg, "netwm")) | |
1310 { | |
1311 if (neg) | |
1312 type &= ~vo_wm_NETWM; | |
1313 else | |
1314 type |= vo_wm_NETWM; | |
1315 } else if (!strcmp(arg, "none")) | |
1316 return 0; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1317 } |
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9217
diff
changeset
|
1318 } |
5919 | 1319 |
12582 | 1320 return type; |
4981 | 1321 } |
1322 | |
27885
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1323 /** |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1324 * \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
|
1325 * \return returns current color depth of vo_window |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1326 */ |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1327 int vo_x11_update_geometry(void) { |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1328 unsigned depth, w, h; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1329 int dummy_int; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1330 Window dummy_win; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1331 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
|
1332 &w, &h, &dummy_int, &depth); |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1333 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
|
1334 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
|
1335 &dummy_win); |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1336 return depth <= INT_MAX ? depth : 0; |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1337 } |
9829cfa41d6d
Replace some of the different inconsistent XGetGeometry uses by a
reimar
parents:
27815
diff
changeset
|
1338 |
12582 | 1339 void vo_x11_fullscreen(void) |
11542 | 1340 { |
12582 | 1341 int x, y, w, h; |
1342 | |
1343 if (WinID >= 0 || vo_fs_flip) | |
1344 return; | |
1345 | |
1346 if (vo_fs) | |
1347 { | |
1348 // fs->win | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1349 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
|
1350 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1351 x = vo_old_x; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1352 y = vo_old_y; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1353 w = vo_old_width; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1354 h = vo_old_height; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1355 } |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1356 |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1357 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
|
1358 vo_fs = VO_FALSE; |
12582 | 1359 } else |
1360 { | |
1361 // win->fs | |
1362 vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH | |
1363 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1364 vo_fs = VO_TRUE; |
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1365 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
|
1366 { |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1367 vo_old_x = vo_dx; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1368 vo_old_y = vo_dy; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1369 vo_old_width = vo_dwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1370 vo_old_height = vo_dheight; |
23875
df05ff41590e
make sure update_xinerama_info is always called even when using the
reimar
parents:
23823
diff
changeset
|
1371 } |
18116 | 1372 update_xinerama_info(); |
1373 x = xinerama_x; | |
1374 y = xinerama_y; | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1375 w = vo_screenwidth; |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1376 h = vo_screenheight; |
12582 | 1377 } |
1378 { | |
1379 long dummy; | |
1380 | |
1381 XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy); | |
1382 if (!(vo_hint.flags & PWinGravity)) | |
1383 old_gravity = NorthWestGravity; | |
1384 else | |
1385 old_gravity = vo_hint.win_gravity; | |
1386 } | |
1387 if (vo_wm_type == 0 && !(vo_fsmode & 16)) | |
1388 { | |
1389 XUnmapWindow(mDisplay, vo_window); // required for MWM | |
1390 XWithdrawWindow(mDisplay, vo_window, mScreen); | |
1391 vo_fs_flip = 1; | |
1392 } | |
1393 | |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1394 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
|
1395 { |
27303
690ba711bda8
Make vo_x11_fullscreen not break vo_border (proper support still needs vo changes)
reimar
parents:
27029
diff
changeset
|
1396 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
|
1397 vo_x11_sizehint(x, y, w, h, 0); |
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1398 vo_x11_setlayer(mDisplay, vo_window, vo_fs); |
12582 | 1399 |
1400 | |
12798
33423862b159
Indentation fix from previous patch, as discussed on IRC.
rtognimp
parents:
12796
diff
changeset
|
1401 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12796
24075685789b
This fixes the problems that originated from my ewmh
rtognimp
parents:
12582
diff
changeset
|
1402 } |
21938 | 1403 /* 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
|
1404 if ((!(vo_fs)) & vo_ontop) |
9b03ad0254ae
Fix ontop for some WMs that lose ontop state after fullscreen event.
al
parents:
14207
diff
changeset
|
1405 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
|
1406 |
12582 | 1407 XMapRaised(mDisplay, vo_window); |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18508
diff
changeset
|
1408 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
|
1409 XMoveResizeWindow(mDisplay, vo_window, x, y, w, h); |
12582 | 1410 XRaiseWindow(mDisplay, vo_window); |
1411 XFlush(mDisplay); | |
1412 } | |
1413 | |
1414 void vo_x11_ontop(void) | |
1415 { | |
1416 vo_ontop = (!(vo_ontop)); | |
1417 | |
1418 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 1419 } |
1420 | |
27306
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1421 void vo_x11_border(void) |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1422 { |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1423 vo_border = !vo_border; |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1424 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
|
1425 } |
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27304
diff
changeset
|
1426 |
9695 | 1427 /* |
1428 * XScreensaver stuff | |
1429 */ | |
1430 | |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1431 static int screensaver_off; |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1432 static unsigned int time_last; |
9695 | 1433 |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1434 void xscreensaver_heartbeat(void) |
9695 | 1435 { |
12031
0c2b8b731d42
Use system clock for xscreensaver pings (Tobias Diedrich).
diego
parents:
11995
diff
changeset
|
1436 unsigned int time = GetTimerMS(); |
9695 | 1437 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1438 if (mDisplay && screensaver_off && (time - time_last) > 30000) |
12582 | 1439 { |
1440 time_last = time; | |
9695 | 1441 |
25609
dc64735e7391
Remove most of the messy screensaver code in favour of only XResetScreenSaver
reimar
parents:
25608
diff
changeset
|
1442 XResetScreenSaver(mDisplay); |
9695 | 1443 } |
1444 } | |
1445 | |
25466 | 1446 static int xss_suspend(Bool suspend) |
1447 { | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1448 #ifndef CONFIG_XSS |
25466 | 1449 return 0; |
1450 #else | |
1451 int event, error, major, minor; | |
1452 if (XScreenSaverQueryExtension(mDisplay, &event, &error) != True || | |
1453 XScreenSaverQueryVersion(mDisplay, &major, &minor) != True) | |
1454 return 0; | |
27029
e8c49e69f46f
Add parentheses to expression to avoid the warning:
diego
parents:
26755
diff
changeset
|
1455 if (major < 1 || (major == 1 && minor < 1)) |
25466 | 1456 return 0; |
1457 XScreenSaverSuspend(mDisplay, suspend); | |
1458 return 1; | |
1459 #endif | |
1460 } | |
1461 | |
9695 | 1462 /* |
1463 * End of XScreensaver stuff | |
1464 */ | |
1465 | |
12582 | 1466 void saver_on(Display * mDisplay) |
1467 { | |
324 | 1468 |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1469 if (!screensaver_off) |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1470 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1471 screensaver_off = 0; |
25466 | 1472 if (xss_suspend(False)) |
1473 return; | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1474 #ifdef CONFIG_XDPMS |
324 | 1475 if (dpms_disabled) |
1476 { | |
25447 | 1477 int nothing; |
12582 | 1478 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1479 { | |
1480 if (!DPMSEnable(mDisplay)) | |
1481 { // restoring power saving settings | |
1482 mp_msg(MSGT_VO, MSGL_WARN, "DPMS not available?\n"); | |
1483 } else | |
1484 { | |
741 | 1485 // DPMS does not seem to be enabled unless we call DPMSInfo |
12582 | 1486 BOOL onoff; |
1487 CARD16 state; | |
1488 | |
1489 DPMSForceLevel(mDisplay, DPMSModeOn); | |
1490 DPMSInfo(mDisplay, &state, &onoff); | |
1491 if (onoff) | |
1492 { | |
13946 | 1493 mp_msg(MSGT_VO, MSGL_V, |
12582 | 1494 "Successfully enabled DPMS\n"); |
1495 } else | |
1496 { | |
1497 mp_msg(MSGT_VO, MSGL_WARN, "Could not enable DPMS\n"); | |
741 | 1498 } |
1499 } | |
12582 | 1500 } |
1501 dpms_disabled = 0; | |
324 | 1502 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1503 #endif |
324 | 1504 } |
1505 | |
12582 | 1506 void saver_off(Display * mDisplay) |
1507 { | |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1508 int nothing; |
324 | 1509 |
25608
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1510 if (screensaver_off) |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1511 return; |
3ada48a71450
Use a screensaver_off variable to save current state and avoid
reimar
parents:
25482
diff
changeset
|
1512 screensaver_off = 1; |
25466 | 1513 if (xss_suspend(True)) |
1514 return; | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1515 #ifdef CONFIG_XDPMS |
324 | 1516 if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) |
1517 { | |
12582 | 1518 BOOL onoff; |
1519 CARD16 state; | |
1520 | |
1521 DPMSInfo(mDisplay, &state, &onoff); | |
1522 if (onoff) | |
1523 { | |
1524 Status stat; | |
1525 | |
13946 | 1526 mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n"); |
12582 | 1527 dpms_disabled = 1; |
1528 stat = DPMSDisable(mDisplay); // monitor powersave off | |
1529 mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat); | |
1530 } | |
324 | 1531 } |
1345
be674b95b485
x11_common does not compile, when the XDPMS extension is not available on the
jkeil
parents:
1266
diff
changeset
|
1532 #endif |
326 | 1533 } |
448
198b46b739d8
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents:
440
diff
changeset
|
1534 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1535 static XErrorHandler old_handler = NULL; |
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1536 static int selectinput_err = 0; |
12582 | 1537 static int x11_selectinput_errorhandler(Display * display, |
1538 XErrorEvent * event) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1539 { |
12582 | 1540 if (event->error_code == BadAccess) |
1541 { | |
1542 selectinput_err = 1; | |
1543 mp_msg(MSGT_VO, MSGL_ERR, | |
1544 "X11 error: BadAccess during XSelectInput Call\n"); | |
1545 mp_msg(MSGT_VO, MSGL_ERR, | |
1546 "X11 error: The 'ButtonPressMask' mask of specified window has probably already used by another appication (see man XSelectInput)\n"); | |
21938 | 1547 /* If you think MPlayer should shutdown with this error, |
1548 * comment out the following line */ | |
12582 | 1549 return 0; |
1550 } | |
1551 if (old_handler != NULL) | |
1552 old_handler(display, event); | |
1553 else | |
1554 x11_errorhandler(display, event); | |
1555 return 0; | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1556 } |
3990 | 1557 |
12582 | 1558 void vo_x11_selectinput_witherr(Display * display, Window w, |
1559 long event_mask) | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1560 { |
12582 | 1561 XSync(display, False); |
1562 old_handler = XSetErrorHandler(x11_selectinput_errorhandler); | |
1563 selectinput_err = 0; | |
1564 if (vo_nomouse_input) | |
1565 { | |
1566 XSelectInput(display, w, | |
1567 event_mask & | |
1568 (~(ButtonPressMask | ButtonReleaseMask))); | |
1569 } else | |
1570 { | |
1571 XSelectInput(display, w, event_mask); | |
1572 } | |
1573 XSync(display, False); | |
1574 XSetErrorHandler(old_handler); | |
1575 if (selectinput_err) | |
1576 { | |
1577 mp_msg(MSGT_VO, MSGL_ERR, | |
1578 "X11 error: MPlayer discards mouse control (reconfiguring)\n"); | |
1579 XSelectInput(display, w, | |
1580 event_mask & | |
1581 (~ | |
1582 (ButtonPressMask | ButtonReleaseMask | | |
1583 PointerMotionMask))); | |
1584 } | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6401
diff
changeset
|
1585 } |
3990 | 1586 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1587 #ifdef CONFIG_XF86VM |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1588 void vo_vm_switch(void) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1589 { |
13828
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1590 int vm_event, vm_error; |
b4ad5f0b550d
Fix erroneus extern declarations, fix wrong signedness of some vars
atmos4
parents:
13787
diff
changeset
|
1591 int vm_ver, vm_rev; |
12582 | 1592 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
|
1593 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
|
1594 int modeline_width, modeline_height; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1595 |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1596 int modecount; |
12582 | 1597 |
1598 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) | |
1599 { | |
1600 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
18508 | 1601 mp_msg(MSGT_VO, MSGL_V, "XF86VidMode extension v%i.%i\n", vm_ver, |
12582 | 1602 vm_rev); |
1603 have_vm = 1; | |
27887
47385b5c0613
Set modeline_width/height to sane values in vo_vm_switch even when
reimar
parents:
27885
diff
changeset
|
1604 } else { |
12582 | 1605 mp_msg(MSGT_VO, MSGL_WARN, |
18508 | 1606 "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
|
1607 } |
12582 | 1608 |
1609 if (have_vm) | |
1610 { | |
1611 if (vidmodes == NULL) | |
1612 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1613 &vidmodes); | |
1614 j = 0; | |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1615 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
|
1616 modeline_height = vidmodes[0]->vdisplay; |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1617 |
12582 | 1618 for (i = 1; i < modecount; i++) |
1619 if ((vidmodes[i]->hdisplay >= X) | |
1620 && (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
|
1621 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
|
1622 && (vidmodes[i]->vdisplay <= modeline_height)) |
12582 | 1623 { |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1624 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
|
1625 modeline_height = vidmodes[i]->vdisplay; |
12582 | 1626 j = i; |
1627 } | |
1628 | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16301
diff
changeset
|
1629 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
|
1630 modeline_width, modeline_height, X, Y); |
12582 | 1631 XF86VidModeLockModeSwitch(mDisplay, mScreen, 0); |
1632 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]); | |
1633 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
|
1634 |
08a5ccceb21a
Set modified window position and monitor aspect in vo_vm_switch instead of in
reimar
parents:
27887
diff
changeset
|
1635 // 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
|
1636 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
|
1637 Y = (vo_screenheight - modeline_height) / 2; |
12582 | 1638 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
|
1639 vo_dx = X; |
08a5ccceb21a
Set modified window position and monitor aspect in vo_vm_switch instead of in
reimar
parents:
27887
diff
changeset
|
1640 vo_dy = Y; |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1641 vo_dwidth = modeline_width; |
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1642 vo_dheight = modeline_height; |
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1643 aspect_save_screenres(modeline_width, modeline_height); |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1644 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1645 } |
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1646 |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1647 void vo_vm_close(void) |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1648 { |
27343 | 1649 #ifdef CONFIG_GUI |
12582 | 1650 if (vidmodes != NULL && vo_window != None) |
1651 #else | |
1652 if (vidmodes != NULL) | |
1653 #endif | |
1654 { | |
1655 int i, modecount; | |
5019 | 1656 |
12582 | 1657 free(vidmodes); |
1658 vidmodes = NULL; | |
1659 XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount, | |
1660 &vidmodes); | |
1661 for (i = 0; i < modecount; i++) | |
1662 if ((vidmodes[i]->hdisplay == vo_screenwidth) | |
1663 && (vidmodes[i]->vdisplay == vo_screenheight)) | |
1664 { | |
1665 mp_msg(MSGT_VO, MSGL_INFO, | |
1666 "Returning to original mode %dx%d\n", | |
1667 vo_screenwidth, vo_screenheight); | |
1668 break; | |
1669 } | |
5019 | 1670 |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
1671 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
|
1672 XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[i]); |
12582 | 1673 free(vidmodes); |
1674 vidmodes = NULL; | |
1675 } | |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1676 } |
3990 | 1677 #endif |
4425
6144f63cbaa1
common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4181
diff
changeset
|
1678 |
12582 | 1679 #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
|
1680 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1681 |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1682 /* |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1683 * 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
|
1684 * 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
|
1685 * 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
|
1686 * >= 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
|
1687 */ |
12582 | 1688 int vo_find_depth_from_visuals(Display * dpy, int screen, |
1689 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
|
1690 { |
12582 | 1691 XVisualInfo visual_tmpl; |
1692 XVisualInfo *visuals; | |
1693 int nvisuals, i; | |
1694 int bestvisual = -1; | |
1695 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
|
1696 |
12582 | 1697 visual_tmpl.screen = screen; |
1698 visual_tmpl.class = TrueColor; | |
1699 visuals = XGetVisualInfo(dpy, | |
1700 VisualScreenMask | VisualClassMask, | |
1701 &visual_tmpl, &nvisuals); | |
1702 if (visuals != NULL) | |
1703 { | |
1704 for (i = 0; i < nvisuals; i++) | |
1705 { | |
1706 mp_msg(MSGT_VO, MSGL_V, | |
17366 | 1707 "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n", |
12582 | 1708 visuals[i].visualid, visuals[i].depth, |
1709 visuals[i].red_mask, visuals[i].green_mask, | |
1710 visuals[i].blue_mask); | |
1711 /* | |
21938 | 1712 * Save the visual index and its depth, if this is the first |
12582 | 1713 * truecolor visul, or a visual that is 'preferred' over the |
21938 | 1714 * previous 'best' visual. |
12582 | 1715 */ |
1716 if (bestvisual_depth == -1 | |
1717 || (visuals[i].depth >= 15 | |
1718 && (visuals[i].depth < bestvisual_depth | |
1719 || bestvisual_depth < 15))) | |
1720 { | |
1721 bestvisual = i; | |
1722 bestvisual_depth = visuals[i].depth; | |
1723 } | |
1724 } | |
1725 | |
1726 if (bestvisual != -1 && visual_return != NULL) | |
1727 *visual_return = visuals[bestvisual].visual; | |
1728 | |
1729 XFree(visuals); | |
7256
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1730 } |
12582 | 1731 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
|
1732 } |
ec6dd0a29d93
Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents:
7111
diff
changeset
|
1733 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1734 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1735 static Colormap cmap = None; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1736 static XColor cols[256]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1737 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
|
1738 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1739 |
12582 | 1740 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
|
1741 { |
12582 | 1742 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
|
1743 |
12582 | 1744 if (vinfo->class != DirectColor) |
1745 return XCreateColormap(mDisplay, mRootWin, vinfo->visual, | |
1746 AllocNone); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1747 |
12582 | 1748 /* can this function get called twice or more? */ |
1749 if (cmap) | |
1750 return cmap; | |
1751 cm_size = vinfo->colormap_size; | |
1752 red_mask = vinfo->red_mask; | |
1753 green_mask = vinfo->green_mask; | |
1754 blue_mask = vinfo->blue_mask; | |
1755 ru = (red_mask & (red_mask - 1)) ^ red_mask; | |
1756 gu = (green_mask & (green_mask - 1)) ^ green_mask; | |
1757 bu = (blue_mask & (blue_mask - 1)) ^ blue_mask; | |
1758 rvu = 65536ull * ru / (red_mask + ru); | |
1759 gvu = 65536ull * gu / (green_mask + gu); | |
1760 bvu = 65536ull * bu / (blue_mask + bu); | |
1761 r = g = b = 0; | |
1762 rv = gv = bv = 0; | |
1763 m = DoRed | DoGreen | DoBlue; | |
1764 for (k = 0; k < cm_size; k++) | |
1765 { | |
1766 int t; | |
1767 | |
1768 cols[k].pixel = r | g | b; | |
1769 cols[k].red = rv; | |
1770 cols[k].green = gv; | |
1771 cols[k].blue = bv; | |
1772 cols[k].flags = m; | |
1773 t = (r + ru) & red_mask; | |
1774 if (t < r) | |
1775 m &= ~DoRed; | |
1776 r = t; | |
1777 t = (g + gu) & green_mask; | |
1778 if (t < g) | |
1779 m &= ~DoGreen; | |
1780 g = t; | |
1781 t = (b + bu) & blue_mask; | |
1782 if (t < b) | |
1783 m &= ~DoBlue; | |
1784 b = t; | |
1785 rv += rvu; | |
1786 gv += gvu; | |
1787 bv += bvu; | |
1788 } | |
1789 cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll); | |
1790 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1791 return cmap; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1792 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1793 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1794 /* |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1795 * 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
|
1796 * 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
|
1797 * 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
|
1798 * 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
|
1799 */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1800 /* 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
|
1801 static int vo_gamma = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1802 static int vo_brightness = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1803 static int vo_contrast = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1804 |
25674
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1805 static int transform_color(float val, |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1806 float brightness, float contrast, float gamma) { |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1807 float s = pow(val, gamma); |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1808 s = (s - 0.5) * contrast + 0.5; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1809 s += brightness; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1810 if (s < 0) |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1811 s = 0; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1812 if (s > 1) |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1813 s = 1; |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1814 return (unsigned short) (s * 65535); |
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1815 } |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1816 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1817 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
|
1818 { |
12582 | 1819 float gamma, brightness, contrast; |
1820 float rf, gf, bf; | |
1821 int k; | |
1822 | |
1823 /* | |
1824 * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case | |
1825 * of TrueColor-ed window but be careful: | |
21938 | 1826 * Unlike the colormaps, which are private for the X client |
12582 | 1827 * who created them and thus automatically destroyed on client |
1828 * disconnect, this gamma ramp is a system-wide (X-server-wide) | |
21938 | 1829 * setting and _must_ be restored before the process exits. |
1830 * Unforunately when the process crashes (or gets killed | |
12582 | 1831 * for some reason) it is impossible to restore the setting, |
1832 * and such behaviour could be rather annoying for the users. | |
1833 */ | |
1834 if (cmap == None) | |
1835 return VO_NOTAVAIL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1836 |
12582 | 1837 if (!strcasecmp(name, "brightness")) |
1838 vo_brightness = value; | |
1839 else if (!strcasecmp(name, "contrast")) | |
1840 vo_contrast = value; | |
1841 else if (!strcasecmp(name, "gamma")) | |
1842 vo_gamma = value; | |
1843 else | |
1844 return VO_NOTIMPL; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1845 |
12582 | 1846 brightness = 0.01 * vo_brightness; |
1847 contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4); | |
1848 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
|
1849 |
12582 | 1850 rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask; |
1851 gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) / | |
1852 green_mask; | |
1853 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
|
1854 |
12582 | 1855 /* now recalculate the colormap using the newly set value */ |
1856 for (k = 0; k < cm_size; k++) | |
1857 { | |
25674
b13f792efe7b
Use a transform_color function to reduce code duplication
reimar
parents:
25626
diff
changeset
|
1858 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
|
1859 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
|
1860 cols[k].blue = transform_color(bf * k, brightness, contrast, gamma); |
12582 | 1861 } |
1862 | |
1863 XStoreColors(mDisplay, cmap, cols, cm_size); | |
1864 XFlush(mDisplay); | |
1865 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1866 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1867 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1868 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
|
1869 { |
12582 | 1870 if (cmap == None) |
1871 return VO_NOTAVAIL; | |
1872 if (!strcasecmp(name, "brightness")) | |
1873 *value = vo_brightness; | |
1874 else if (!strcasecmp(name, "contrast")) | |
1875 *value = vo_contrast; | |
1876 else if (!strcasecmp(name, "gamma")) | |
1877 *value = vo_gamma; | |
1878 else | |
1879 return VO_NOTIMPL; | |
1880 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1881 } |
12582 | 1882 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
1883 #ifdef CONFIG_XV |
10359 | 1884 int vo_xv_set_eq(uint32_t xv_port, char *name, int value) |
1885 { | |
1886 XvAttribute *attributes; | |
12582 | 1887 int i, howmany, xv_atom; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7766
diff
changeset
|
1888 |
10359 | 1889 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
|
1890 |
10359 | 1891 /* get available attributes */ |
1892 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
1893 for (i = 0; i < howmany && attributes; i++) | |
12582 | 1894 if (attributes[i].flags & XvSettable) |
1895 { | |
1896 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 1897 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
1898 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 1899 if (xv_atom != None) |
1900 { | |
1901 int hue = 0, port_value, port_min, port_max; | |
10359 | 1902 |
12582 | 1903 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
1904 (!strcasecmp(name, "brightness"))) | |
1905 port_value = value; | |
1906 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
1907 (!strcasecmp(name, "contrast"))) | |
1908 port_value = value; | |
1909 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
1910 (!strcasecmp(name, "saturation"))) | |
1911 port_value = value; | |
1912 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
1913 (!strcasecmp(name, "hue"))) | |
1914 { | |
1915 port_value = value; | |
1916 hue = 1; | |
1917 } else | |
10359 | 1918 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 1919 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
1920 (!strcasecmp(name, "red_intensity"))) | |
1921 port_value = value; | |
1922 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
1923 && (!strcasecmp(name, "green_intensity"))) | |
1924 port_value = value; | |
1925 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
1926 && (!strcasecmp(name, "blue_intensity"))) | |
1927 port_value = value; | |
1928 else | |
1929 continue; | |
1930 | |
1931 port_min = attributes[i].min_value; | |
1932 port_max = attributes[i].max_value; | |
10359 | 1933 |
12582 | 1934 /* nvidia hue workaround */ |
1935 if (hue && port_min == 0 && port_max == 360) | |
1936 { | |
1937 port_value = | |
1938 (port_value >= | |
1939 0) ? (port_value - 100) : (port_value + 100); | |
10359 | 1940 } |
12582 | 1941 // -100 -> min |
1942 // 0 -> (max+min)/2 | |
1943 // +100 -> max | |
1944 port_value = | |
1945 (port_value + 100) * (port_max - port_min) / 200 + | |
1946 port_min; | |
1947 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value); | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
1948 return VO_TRUE; |
12582 | 1949 } |
1950 } | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
1951 return VO_FALSE; |
10359 | 1952 } |
1953 | |
1954 int vo_xv_get_eq(uint32_t xv_port, char *name, int *value) | |
1955 { | |
12582 | 1956 |
10359 | 1957 XvAttribute *attributes; |
12582 | 1958 int i, howmany, xv_atom; |
10359 | 1959 |
1960 /* get available attributes */ | |
1961 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
1962 for (i = 0; i < howmany && attributes; i++) | |
12582 | 1963 if (attributes[i].flags & XvGettable) |
1964 { | |
1965 xv_atom = XInternAtom(mDisplay, attributes[i].name, True); | |
10359 | 1966 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
1967 then trigger it if it's ok so that the other values are at default upon query */ | |
12582 | 1968 if (xv_atom != None) |
1969 { | |
1970 int val, port_value = 0, port_min, port_max; | |
10359 | 1971 |
12582 | 1972 XvGetPortAttribute(mDisplay, xv_port, xv_atom, |
1973 &port_value); | |
1974 | |
1975 port_min = attributes[i].min_value; | |
1976 port_max = attributes[i].max_value; | |
1977 val = | |
1978 (port_value - port_min) * 200 / (port_max - port_min) - | |
1979 100; | |
10359 | 1980 |
12582 | 1981 if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") && |
1982 (!strcasecmp(name, "brightness"))) | |
1983 *value = val; | |
1984 else if (!strcmp(attributes[i].name, "XV_CONTRAST") && | |
1985 (!strcasecmp(name, "contrast"))) | |
1986 *value = val; | |
1987 else if (!strcmp(attributes[i].name, "XV_SATURATION") && | |
1988 (!strcasecmp(name, "saturation"))) | |
1989 *value = val; | |
1990 else if (!strcmp(attributes[i].name, "XV_HUE") && | |
1991 (!strcasecmp(name, "hue"))) | |
1992 { | |
1993 /* nasty nvidia detect */ | |
1994 if (port_min == 0 && port_max == 360) | |
1995 *value = (val >= 0) ? (val - 100) : (val + 100); | |
1996 else | |
1997 *value = val; | |
1998 } else | |
10359 | 1999 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
12582 | 2000 if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") && |
2001 (!strcasecmp(name, "red_intensity"))) | |
2002 *value = val; | |
2003 else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY") | |
2004 && (!strcasecmp(name, "green_intensity"))) | |
2005 *value = val; | |
2006 else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY") | |
2007 && (!strcasecmp(name, "blue_intensity"))) | |
2008 *value = val; | |
2009 else | |
2010 continue; | |
10359 | 2011 |
12582 | 2012 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", |
2013 name, *value); | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
2014 return VO_TRUE; |
12582 | 2015 } |
2016 } | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26436
diff
changeset
|
2017 return VO_FALSE; |
10359 | 2018 } |
2019 | |
14742 | 2020 /** \brief contains flags changing the execution of the colorkeying code */ |
2021 xv_ck_info_t xv_ck_info = { CK_METHOD_MANUALFILL, CK_SRC_CUR }; | |
2022 unsigned long xv_colorkey; ///< The color used for manual colorkeying. | |
2023 unsigned int xv_port; ///< The selected Xv port. | |
2024 | |
2025 /** | |
2026 * \brief Interns the requested atom if it is available. | |
2027 * | |
2028 * \param atom_name String containing the name of the requested atom. | |
2029 * | |
2030 * \return Returns the atom if available, else None is returned. | |
2031 * | |
2032 */ | |
2033 static Atom xv_intern_atom_if_exists( char const * atom_name ) | |
2034 { | |
2035 XvAttribute * attributes; | |
2036 int attrib_count,i; | |
2037 Atom xv_atom = None; | |
2038 | |
2039 attributes = XvQueryPortAttributes( mDisplay, xv_port, &attrib_count ); | |
2040 if( attributes!=NULL ) | |
2041 { | |
2042 for ( i = 0; i < attrib_count; ++i ) | |
2043 { | |
2044 if ( strcmp(attributes[i].name, atom_name ) == 0 ) | |
2045 { | |
2046 xv_atom = XInternAtom( mDisplay, atom_name, False ); | |
2047 break; // found what we want, break out | |
2048 } | |
2049 } | |
2050 XFree( attributes ); | |
2051 } | |
2052 | |
2053 return xv_atom; | |
2054 } | |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2055 |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2056 /** |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2057 * \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
|
2058 * \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
|
2059 */ |
22886 | 2060 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
|
2061 { |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2062 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
|
2063 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
|
2064 return -1; |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2065 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
|
2066 } |
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15789
diff
changeset
|
2067 |
14742 | 2068 /** |
16958 | 2069 * \brief Get maximum supported source image dimensions. |
2070 * | |
2071 * This function does not set the variables pointed to by | |
21938 | 2072 * width and height if the information could not be retrieved, |
2073 * so the caller is reponsible for properly initializing them. | |
16958 | 2074 * |
2075 * \param width [out] The maximum width gets stored here. | |
2076 * \param height [out] The maximum height gets stored here. | |
2077 * | |
2078 */ | |
2079 void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ) | |
2080 { | |
2081 XvEncodingInfo * encodings; | |
2082 //unsigned long num_encodings, idx; to int or too long?! | |
2083 unsigned int num_encodings, idx; | |
2084 | |
2085 XvQueryEncodings( mDisplay, xv_port, &num_encodings, &encodings); | |
2086 | |
2087 if ( encodings ) | |
2088 { | |
2089 for ( idx = 0; idx < num_encodings; ++idx ) | |
2090 { | |
2091 if ( strcmp( encodings[idx].name, "XV_IMAGE" ) == 0 ) | |
2092 { | |
2093 *width = encodings[idx].width; | |
2094 *height = encodings[idx].height; | |
2095 break; | |
2096 } | |
2097 } | |
2098 } | |
2099 | |
2100 mp_msg( MSGT_VO, MSGL_V, | |
2101 "[xv common] Maximum source image dimensions: %ux%u\n", | |
2102 *width, *height ); | |
2103 | |
2104 XvFreeEncodingInfo( encodings ); | |
2105 } | |
2106 | |
2107 /** | |
14742 | 2108 * \brief Print information about the colorkey method and source. |
2109 * | |
2110 * \param ck_handling Integer value containing the information about | |
2111 * colorkey handling (see x11_common.h). | |
2112 * | |
2113 * Outputs the content of |ck_handling| as a readable message. | |
2114 * | |
2115 */ | |
22886 | 2116 void vo_xv_print_ck_info(void) |
14742 | 2117 { |
2118 mp_msg( MSGT_VO, MSGL_V, "[xv common] " ); | |
2119 | |
2120 switch ( xv_ck_info.method ) | |
2121 { | |
2122 case CK_METHOD_NONE: | |
2123 mp_msg( MSGT_VO, MSGL_V, "Drawing no colorkey.\n" ); return; | |
2124 case CK_METHOD_AUTOPAINT: | |
2125 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn by Xv." ); break; | |
2126 case CK_METHOD_MANUALFILL: | |
2127 mp_msg( MSGT_VO, MSGL_V, "Drawing colorkey manually." ); break; | |
2128 case CK_METHOD_BACKGROUND: | |
2129 mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn as window background." ); break; | |
2130 } | |
2131 | |
2132 mp_msg( MSGT_VO, MSGL_V, "\n[xv common] " ); | |
2133 | |
2134 switch ( xv_ck_info.source ) | |
2135 { | |
2136 case CK_SRC_CUR: | |
17366 | 2137 mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n", |
14742 | 2138 xv_colorkey ); |
2139 break; | |
2140 case CK_SRC_USE: | |
2141 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2142 { | |
2143 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2144 "Ignoring colorkey from MPlayer (0x%06lx).\n", |
14742 | 2145 xv_colorkey ); |
2146 } | |
2147 else | |
2148 { | |
2149 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2150 "Using colorkey from MPlayer (0x%06lx)." |
14742 | 2151 " Use -colorkey to change.\n", |
2152 xv_colorkey ); | |
2153 } | |
2154 break; | |
2155 case CK_SRC_SET: | |
2156 mp_msg( MSGT_VO, MSGL_V, | |
17366 | 2157 "Setting and using colorkey from MPlayer (0x%06lx)." |
14742 | 2158 " Use -colorkey to change.\n", |
2159 xv_colorkey ); | |
2160 break; | |
2161 } | |
2162 } | |
2163 /** | |
2164 * \brief Init colorkey depending on the settings in xv_ck_info. | |
2165 * | |
2166 * \return Returns 0 on failure and 1 on success. | |
2167 * | |
2168 * Sets the colorkey variable according to the CK_SRC_* and CK_METHOD_* | |
2169 * flags in xv_ck_info. | |
2170 * | |
2171 * Possiblilities: | |
2172 * * Methods | |
2173 * - manual colorkey drawing ( CK_METHOD_MANUALFILL ) | |
2174 * - set colorkey as window background ( CK_METHOD_BACKGROUND ) | |
2175 * - let Xv paint the colorkey ( CK_METHOD_AUTOPAINT ) | |
2176 * * Sources | |
2177 * - use currently set colorkey ( CK_SRC_CUR ) | |
2178 * - use colorkey in vo_colorkey ( CK_SRC_USE ) | |
2179 * - use and set colorkey in vo_colorkey ( CK_SRC_SET ) | |
2180 * | |
2181 * NOTE: If vo_colorkey has bits set after the first 3 low order bytes | |
2182 * we don't draw anything as this means it was forced to off. | |
2183 */ | |
22886 | 2184 int vo_xv_init_colorkey(void) |
14742 | 2185 { |
2186 Atom xv_atom; | |
2187 int rez; | |
2188 | |
2189 /* check if colorkeying is needed */ | |
2190 xv_atom = xv_intern_atom_if_exists( "XV_COLORKEY" ); | |
2191 | |
2192 /* if we have to deal with colorkeying ... */ | |
2193 if( xv_atom != None && !(vo_colorkey & 0xFF000000) ) | |
2194 { | |
2195 /* check if we should use the colorkey specified in vo_colorkey */ | |
2196 if ( xv_ck_info.source != CK_SRC_CUR ) | |
2197 { | |
2198 xv_colorkey = vo_colorkey; | |
2199 | |
2200 /* check if we have to set the colorkey too */ | |
2201 if ( xv_ck_info.source == CK_SRC_SET ) | |
2202 { | |
2203 xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False); | |
2204 | |
2205 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, vo_colorkey ); | |
2206 if ( rez != Success ) | |
2207 { | |
2208 mp_msg( MSGT_VO, MSGL_FATAL, | |
2209 "[xv common] Couldn't set colorkey!\n" ); | |
2210 return 0; // error setting colorkey | |
2211 } | |
2212 } | |
2213 } | |
2214 else | |
2215 { | |
2216 int colorkey_ret; | |
2217 | |
2218 rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey_ret); | |
2219 if ( rez == Success ) | |
2220 { | |
2221 xv_colorkey = colorkey_ret; | |
2222 } | |
2223 else | |
2224 { | |
2225 mp_msg( MSGT_VO, MSGL_FATAL, | |
2226 "[xv common] Couldn't get colorkey!" | |
2227 "Maybe the selected Xv port has no overlay.\n" ); | |
2228 return 0; // error getting colorkey | |
2229 } | |
2230 } | |
2231 | |
15186 | 2232 xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" ); |
2233 | |
14742 | 2234 /* should we draw the colorkey ourselves or activate autopainting? */ |
2235 if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) | |
2236 { | |
2237 rez = !Success; // reset rez to something different than Success | |
2238 | |
2239 if ( xv_atom != None ) // autopaint is supported | |
2240 { | |
2241 rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, 1 ); | |
2242 } | |
2243 | |
2244 if ( rez != Success ) | |
2245 { | |
2246 // fallback to manual colorkey drawing | |
2247 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2248 } | |
2249 } | |
15186 | 2250 else // disable colorkey autopainting if supported |
2251 { | |
2252 if ( xv_atom != None ) // we have autopaint attribute | |
2253 { | |
2254 XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 ); | |
2255 } | |
2256 } | |
14742 | 2257 } |
2258 else // do no colorkey drawing at all | |
2259 { | |
2260 xv_ck_info.method = CK_METHOD_NONE; | |
2261 } /* end: should we draw colorkey */ | |
2262 | |
21938 | 2263 /* output information about the current colorkey settings */ |
14742 | 2264 vo_xv_print_ck_info(); |
2265 | |
2266 return 1; // success | |
2267 } | |
2268 | |
2269 /** | |
2270 * \brief Draw the colorkey on the video window. | |
2271 * | |
2272 * Draws the colorkey depending on the set method ( colorkey_handling ). | |
2273 * | |
21938 | 2274 * Also draws the black bars ( when the video doesn't fit the display in |
2275 * fullscreen ) separately, so they don't overlap with the video area. | |
2276 * It doesn't call XFlush. | |
14742 | 2277 * |
2278 */ | |
24890 | 2279 void vo_xv_draw_colorkey( int32_t x, int32_t y, |
15100 | 2280 int32_t w, int32_t h ) |
14742 | 2281 { |
15100 | 2282 if( xv_ck_info.method == CK_METHOD_MANUALFILL || |
2283 xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow() | |
14742 | 2284 { |
2285 XSetForeground( mDisplay, vo_gc, xv_colorkey ); | |
2286 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2287 x, y, | |
2288 w, h ); | |
2289 } | |
2290 | |
2291 /* draw black bars if needed */ | |
15100 | 2292 /* TODO! move this to vo_x11_clearwindow_part() */ |
14742 | 2293 if ( vo_fs ) |
2294 { | |
2295 XSetForeground( mDisplay, vo_gc, 0 ); | |
21938 | 2296 /* making non-overlap fills, requires 8 checks instead of 4 */ |
14742 | 2297 if ( y > 0 ) |
2298 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2299 0, 0, | |
2300 vo_screenwidth, y); | |
2301 if (x > 0) | |
2302 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2303 0, 0, |
2304 x, vo_screenheight); | |
14742 | 2305 if (x + w < vo_screenwidth) |
2306 XFillRectangle( mDisplay, vo_window, vo_gc, | |
15100 | 2307 x + w, 0, |
2308 vo_screenwidth, vo_screenheight); | |
14742 | 2309 if (y + h < vo_screenheight) |
2310 XFillRectangle( mDisplay, vo_window, vo_gc, | |
2311 0, y + h, | |
15100 | 2312 vo_screenwidth, vo_screenheight); |
14742 | 2313 } |
2314 } | |
2315 | |
21938 | 2316 /** \brief Tests if a valid argument for the ck suboption was given. */ |
14742 | 2317 int xv_test_ck( void * arg ) |
2318 { | |
2319 strarg_t * strarg = (strarg_t *)arg; | |
2320 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2321 if ( strargcmp( strarg, "use" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2322 strargcmp( strarg, "set" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2323 strargcmp( strarg, "cur" ) == 0 ) |
14742 | 2324 { |
2325 return 1; | |
2326 } | |
2327 | |
2328 return 0; | |
2329 } | |
21938 | 2330 /** \brief Tests if a valid arguments for the ck-method suboption was given. */ |
14742 | 2331 int xv_test_ckm( void * arg ) |
2332 { | |
2333 strarg_t * strarg = (strarg_t *)arg; | |
2334 | |
15734
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2335 if ( strargcmp( strarg, "bg" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2336 strargcmp( strarg, "man" ) == 0 || |
7e4fa8fc255c
helper functions for comparing strarg_t "strings".
reimar
parents:
15186
diff
changeset
|
2337 strargcmp( strarg, "auto" ) == 0 ) |
14742 | 2338 { |
2339 return 1; | |
2340 } | |
2341 | |
2342 return 0; | |
2343 } | |
2344 | |
2345 /** | |
2346 * \brief Modify the colorkey_handling var according to str | |
2347 * | |
2348 * Checks if a valid pointer ( not NULL ) to the string | |
2349 * was given. And in that case modifies the colorkey_handling | |
2350 * var to reflect the requested behaviour. | |
2351 * If nothing happens the content of colorkey_handling stays | |
2352 * the same. | |
2353 * | |
2354 * \param str Pointer to the string or NULL | |
2355 * | |
2356 */ | |
2357 void xv_setup_colorkeyhandling( char const * ck_method_str, | |
2358 char const * ck_str ) | |
2359 { | |
2360 /* check if a valid pointer to the string was passed */ | |
2361 if ( ck_str ) | |
2362 { | |
2363 if ( strncmp( ck_str, "use", 3 ) == 0 ) | |
2364 { | |
2365 xv_ck_info.source = CK_SRC_USE; | |
2366 } | |
2367 else if ( strncmp( ck_str, "set", 3 ) == 0 ) | |
2368 { | |
2369 xv_ck_info.source = CK_SRC_SET; | |
2370 } | |
2371 } | |
2372 /* check if a valid pointer to the string was passed */ | |
2373 if ( ck_method_str ) | |
2374 { | |
2375 if ( strncmp( ck_method_str, "bg", 2 ) == 0 ) | |
2376 { | |
2377 xv_ck_info.method = CK_METHOD_BACKGROUND; | |
2378 } | |
2379 else if ( strncmp( ck_method_str, "man", 3 ) == 0 ) | |
2380 { | |
2381 xv_ck_info.method = CK_METHOD_MANUALFILL; | |
2382 } | |
2383 else if ( strncmp( ck_method_str, "auto", 4 ) == 0 ) | |
2384 { | |
2385 xv_ck_info.method = CK_METHOD_AUTOPAINT; | |
2386 } | |
2387 } | |
2388 } | |
2389 | |
10359 | 2390 #endif |