jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add offset to xcursor 

This patch adds the option to specify an offset for the cursor position.

Small fix to texture format aswell.
master
fryshorts 2014-05-04 18:01:32 +02:00
parent 29443eaa15
commit 9f76396227
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/linux-xshm/xcursor.c
View File

@ -55,7 +55,7 @@ static void xcursor_create(xcursor_t *data, XFixesCursorImage *xc) {
texture_destroy(data->tex);
data->tex = gs_create_texture(xc->width, xc->height,
GS_RGBA, 1, (const void **) &pixels, GS_DYNAMIC);
GS_BGRA, 1, (const void **) &pixels, GS_DYNAMIC);
}
bfree(pixels);
@ -86,8 +86,8 @@ void xcursor_tick(xcursor_t *data) {
if (!data->tex || data->last_serial != xc->cursor_serial)
xcursor_create(data, xc);
data->pos_x = -1.0 * (xc->x - xc->xhot);
data->pos_y = -1.0 * (xc->y - xc->yhot);
data->pos_x = -1.0 * (xc->x - xc->xhot - data->x_org);
data->pos_y = -1.0 * (xc->y - xc->yhot - data->y_org);
XFree(xc);
}
@ -110,3 +110,10 @@ void xcursor_render(xcursor_t *data) {
gs_matrix_pop();
}
void xcursor_offset(xcursor_t* data, int_fast32_t x_org, int_fast32_t y_org)
{
data->x_org = x_org;
data->y_org = y_org;
}

12
plugins/linux-xshm/xcursor.h
View File

@ -28,9 +28,12 @@ typedef struct {
float pos_x;
float pos_y;
unsigned long last_serial;
unsigned short int last_width;
unsigned short int last_height;
uint_fast32_t last_width;
uint_fast32_t last_height;
texture_t tex;
int_fast32_t x_org;
int_fast32_t y_org;
} xcursor_t;
/**
@ -59,6 +62,11 @@ void xcursor_tick(xcursor_t *data);
*/
void xcursor_render(xcursor_t *data);
/**
* Specify offset for the cursor
*/
void xcursor_offset(xcursor_t *data, int_fast32_t x_org, int_fast32_t y_org);
#ifdef __cplusplus
}
#endif