mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnd: Simplify drag icon creation

Browse Source 
We used to have to composite the pointer on top of the drag icon, but
the final protocol allows us to specify both a drag icon and a cursor.
Remove the complexity that dealt with that.
This commit is contained in:
Kristian Høgsberg
2013-11-22 11:37:16 -08:00
parent 0d379744d3
commit 617e9a37f2
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/dnd.c
+8 -25
View File
@@ -334,48 +334,31 @@ static const struct wl_data_source_listener data_source_listener = {
}; };
static cairo_surface_t * static cairo_surface_t *
create_drag_cursor(struct dnd_drag *dnd_drag, create_drag_icon(struct dnd_drag *dnd_drag,
struct item *item, int32_t x, int32_t y, double opacity) struct item *item, int32_t x, int32_t y, double opacity)
{ {
struct dnd *dnd = dnd_drag->dnd; struct dnd *dnd = dnd_drag->dnd;
cairo_surface_t *surface; cairo_surface_t *surface;
struct wl_cursor_image *pointer;
struct rectangle rectangle; struct rectangle rectangle;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
cairo_t *cr; cairo_t *cr;
pointer = display_get_pointer_image(dnd->display, CURSOR_DRAGGING); rectangle.width = item_width;
if (!pointer) { rectangle.height = item_height;
fprintf(stderr, "WARNING: grabbing cursor image not found\n");
pointer = display_get_pointer_image(dnd->display,
CURSOR_LEFT_PTR);
assert(pointer && "no cursor image found");
}
rectangle.width = item_width + 2 * pointer->width;
rectangle.height = item_height + 2 * pointer->height;
surface = display_create_surface(dnd->display, NULL, &rectangle, surface = display_create_surface(dnd->display, NULL, &rectangle,
SURFACE_SHM); SURFACE_SHM);
cr = cairo_create(surface); cr = cairo_create(surface);
cairo_translate(cr, pointer->width, pointer->height);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0, 0, 0, 0);
cairo_paint(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
cairo_set_source_surface(cr, item->surface, 0, 0); cairo_set_source_surface(cr, item->surface, 0, 0);
pattern = cairo_pattern_create_rgba(0, 0, 0, opacity); pattern = cairo_pattern_create_rgba(0, 0, 0, opacity);
cairo_mask(cr, pattern); cairo_mask(cr, pattern);
cairo_pattern_destroy(pattern); cairo_pattern_destroy(pattern);
/* FIXME: more cairo-gl brokeness */
surface_flush_device(surface);
cairo_destroy(cr); cairo_destroy(cr);
dnd_drag->hotspot_x = pointer->width + x - item->x; dnd_drag->hotspot_x = x - item->x;
dnd_drag->hotspot_y = pointer->height + y - item->y; dnd_drag->hotspot_y = y - item->y;
dnd_drag->width = rectangle.width; dnd_drag->width = rectangle.width;
dnd_drag->height = rectangle.height; dnd_drag->height = rectangle.height;
@@ -453,9 +436,9 @@ dnd_button_handler(struct widget *widget,
input_set_pointer_image(input, CURSOR_DRAGGING); input_set_pointer_image(input, CURSOR_DRAGGING);
dnd_drag->opaque = dnd_drag->opaque =
create_drag_cursor(dnd_drag, item, x, y, 1); create_drag_icon(dnd_drag, item, x, y, 1);
dnd_drag->translucent = dnd_drag->translucent =
create_drag_cursor(dnd_drag, item, x, y, 0.2); create_drag_icon(dnd_drag, item, x, y, 0.2);
if (dnd->self_only) if (dnd->self_only)
icon = dnd_drag->opaque; icon = dnd_drag->opaque;