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