generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avdevice/x11grab: fix cursor drawing in multi-screen setup

Browse Source 
The code uses XFixes to retrieve the cursor coordinates, but XFixes
gives no information of what screen the pointer is on; this results in
always drawing the cursor on the captured screen even if the mouse
pointer was on another screen.

For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1")
the cursor was being drawn in the captured image even when the mouse
pointer was actually on screen 0, which is wrong and visually confusing.

Use XQueryPointer to check that the pointer is actually on the screen
which is being captured.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Antonio Ospite 2014-09-08 13:15:19 +02:00 committed by Michael Niedermayer
parent 5a8e51f661
commit 69c34a6ac9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavdevice/x11grab.c
View File

@ -391,6 +391,14 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
uint8_t *pix = image->data;
Window root;
XSetWindowAttributes attr;
Bool pointer_on_screen;
Window w;
int _;
root = DefaultRootWindow(dpy);
pointer_on_screen = XQueryPointer(dpy, root, &w, &w, &_, &_, &_, &_, &_);
if (!pointer_on_screen)
return;
/* Code doesn't currently support 16-bit or PAL8 */
if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
@ -398,7 +406,6 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
if (!s->c)
s->c = XCreateFontCursor(dpy, XC_left_ptr);
root = DefaultRootWindow(dpy);
attr.cursor = s->c;
XChangeWindowAttributes(dpy, root, CWCursor, &attr);