RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303' 

* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
  x11grab: Check the XQueryPointer return value

Conflicts:
	libavdevice/x11grab.c

See: 69c34a6ac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-05 03:35:22 +02:00
parent 8e5be0fffe 2a5ac99e6e
commit 345160a9cd
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavdevice/x11grab.c
View File

@ -410,14 +410,6 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
uint8_t *pix = image->data; uint8_t *pix = image->data;
Window root; Window root;
XSetWindowAttributes attr; 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 */ /* Code doesn't currently support 16-bit or PAL8 */
if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32) if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
@ -425,6 +417,7 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
if (!s->c) if (!s->c)
s->c = XCreateFontCursor(dpy, XC_left_ptr); s->c = XCreateFontCursor(dpy, XC_left_ptr);
root = DefaultRootWindow(dpy);
attr.cursor = s->c; attr.cursor = s->c;
XChangeWindowAttributes(dpy, root, CWCursor, &attr); XChangeWindowAttributes(dpy, root, CWCursor, &attr);
@ -527,8 +520,8 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
int follow_mouse = s->follow_mouse; int follow_mouse = s->follow_mouse;
int screen; int screen, pointer_x, pointer_y, _, same_screen = 1;
Window root; Window w, root;
int64_t curtime, delay; int64_t curtime, delay;
struct timespec ts; struct timespec ts;
@ -566,14 +559,16 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen); root = RootWindow(dpy, screen);
if (follow_mouse) {
if (follow_mouse || s->draw_mouse)
same_screen = XQueryPointer(dpy, root, &w, &w,
&pointer_x, &pointer_y, &_, &_, &_);
if (follow_mouse && same_screen) {
int screen_w, screen_h; int screen_w, screen_h;
int pointer_x, pointer_y, _;
Window w;
screen_w = DisplayWidth(dpy, screen); screen_w = DisplayWidth(dpy, screen);
screen_h = DisplayHeight(dpy, screen); screen_h = DisplayHeight(dpy, screen);
XQueryPointer(dpy, root, &w, &w, &pointer_x, &pointer_y, &_, &_, &_);
if (follow_mouse == -1) { if (follow_mouse == -1) {
// follow the mouse, put it at center of grabbing region // follow the mouse, put it at center of grabbing region
x_off += pointer_x - s->width / 2 - x_off; x_off += pointer_x - s->width / 2 - x_off;
@ -600,7 +595,7 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
s->y_off - REGION_WIN_BORDER); s->y_off - REGION_WIN_BORDER);
} }
if (s->show_region) { if (s->show_region && same_screen) {
if (s->region_win) { if (s->region_win) {
XEvent evt = { .type = NoEventMask }; XEvent evt = { .type = NoEventMask };
// Clean up the events, and do the initial draw or redraw. // Clean up the events, and do the initial draw or redraw.
@ -622,7 +617,7 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
av_log(s1, AV_LOG_INFO, "XGetZPixmap() failed\n"); av_log(s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
} }
if (s->draw_mouse) if (s->draw_mouse && same_screen)
paint_mouse_pointer(image, s1); paint_mouse_pointer(image, s1);
return s->frame_size; return s->frame_size;