summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorIsaac Dooley <ffmpeg@isaacdooley.com>2012-10-23 21:39:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-23 21:49:01 +0200
commit469a65b1502505cb8f46938b1b316e4c17a2f2a0 (patch)
tree292c4f0aae562ead942209726c42136859cabc95 /libavdevice
parente2820d99f25d3ec308cbe999734f528cb580d2de (diff)
x11: Fix x11grab BadCursor
Fixes Ticket1738 Based-on: A fix found in a perl module (http://ffmpeg.org/pipermail/ffmpeg-user/2012-August/008804.html) Reviewed-by: Clemens Fruhwirth <clemens@endorphin.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/x11grab.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 91c62d93e7..4dddceb5aa 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -43,6 +43,7 @@
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
#include <time.h>
+#include <X11/cursorfont.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
@@ -357,6 +358,12 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
return;
+ Cursor c = XCreateFontCursor(dpy, XC_left_ptr);
+ Window w = DefaultRootWindow(dpy);
+ XSetWindowAttributes attr;
+ attr.cursor = c;
+ XChangeWindowAttributes(dpy, w, CWCursor, &attr);
+
xcim = XFixesGetCursorImage(dpy);
x = xcim->x - xcim->xhot;