|
|
|
@ -242,12 +242,12 @@ getCurrentPointer(AVFormatContext *s1, X11Grab *s, int *x, int *y) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#define DRAW_CURSOR_TEMPLATE(type_t) \ |
|
|
|
|
do { \
|
|
|
|
|
type_t *cursor; \
|
|
|
|
|
int width_cursor; \
|
|
|
|
|
uint16_t bm_b, bm_w, mask; \
|
|
|
|
|
\
|
|
|
|
|
for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \
|
|
|
|
|
do { \
|
|
|
|
|
type_t *cursor; \
|
|
|
|
|
int width_cursor; \
|
|
|
|
|
uint16_t bm_b, bm_w, mask; \
|
|
|
|
|
\
|
|
|
|
|
for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \
|
|
|
|
|
if (s->mouse_wanted == 1) { \
|
|
|
|
|
bm_b = mousePointerBlack[line]; \
|
|
|
|
|
bm_w = mousePointerWhite[line]; \
|
|
|
|
@ -256,7 +256,7 @@ for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \ |
|
|
|
|
bm_w = mousePointerBlack[line]; \
|
|
|
|
|
} \
|
|
|
|
|
mask = ( 0x0001 << 15 ); \
|
|
|
|
|
\
|
|
|
|
|
\
|
|
|
|
|
for (cursor = (type_t*) im_data, width_cursor = 0; \
|
|
|
|
|
((width_cursor + *x) < (width + x_off) && width_cursor < 16); \
|
|
|
|
|
cursor++, width_cursor++) { \
|
|
|
|
@ -268,8 +268,8 @@ for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \ |
|
|
|
|
mask >>= 1; \
|
|
|
|
|
} \
|
|
|
|
|
im_data += image->bytes_per_line; \
|
|
|
|
|
} \
|
|
|
|
|
} while (0) |
|
|
|
|
} \
|
|
|
|
|
} while (0) |
|
|
|
|
|
|
|
|
|
static void |
|
|
|
|
paintMousePointer(AVFormatContext *s1, X11Grab *s, int *x, int *y, XImage *image) |
|
|
|
|