mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

window.c: Drop timestamp argument to input_set_pointer_image() 

We need the serial to set a pointer image and we track that internally.
This commit is contained in:
Kristian Høgsberg 2012-06-04 16:04:07 -04:00
parent 6597506ac3
commit 5a4e9ff51b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/dnd.c
View File

@ -423,7 +423,7 @@ dnd_button_handler(struct widget *widget,
dnd_drag->drag_surface, dnd_drag->drag_surface,
serial); serial);
input_set_pointer_image(input, time, 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_cursor(dnd_drag, item, x, y, 1);

13
clients/window.c
View File

@ -1612,7 +1612,7 @@ frame_button_handler(struct widget *widget,
case THEME_LOCATION_TITLEBAR: case THEME_LOCATION_TITLEBAR:
if (!window->shell_surface) if (!window->shell_surface)
break; break;
input_set_pointer_image(input, time, CURSOR_DRAGGING); input_set_pointer_image(input, CURSOR_DRAGGING);
input_ungrab(input); input_ungrab(input);
wl_shell_surface_move(window->shell_surface, wl_shell_surface_move(window->shell_surface,
input_get_seat(input), input_get_seat(input),
@ -1729,8 +1729,7 @@ input_set_focus_widget(struct input *input, struct widget *focus,
widget->user_data); widget->user_data);
input->focus_widget = focus; input->focus_widget = focus;
input_set_pointer_image(input, input->pointer_enter_serial, input_set_pointer_image(input, pointer);
pointer);
} }
} }
@ -1762,7 +1761,7 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
input, time, sx, sy, input, time, sx, sy,
widget->user_data); widget->user_data);
input_set_pointer_image(input, time, cursor); input_set_pointer_image(input, cursor);
} }
void void
@ -2275,7 +2274,7 @@ static const struct wl_data_device_listener data_device_listener = {
}; };
void void
input_set_pointer_image(struct input *input, uint32_t time, int pointer) input_set_pointer_image(struct input *input, int pointer)
{ {
struct wl_buffer *buffer; struct wl_buffer *buffer;
struct wl_cursor *cursor; struct wl_cursor *cursor;
@ -2294,8 +2293,8 @@ input_set_pointer_image(struct input *input, uint32_t time, int pointer)
return; return;
input->current_cursor = pointer; input->current_cursor = pointer;
wl_pointer_attach(input->pointer, time, buffer, wl_pointer_attach(input->pointer, input->pointer_enter_serial,
image->hotspot_x, image->hotspot_y); buffer, image->hotspot_x, image->hotspot_y);
} }
struct wl_data_device * struct wl_data_device *

2
clients/window.h
View File

@ -364,7 +364,7 @@ struct widget *
frame_create(struct window *window, void *data); frame_create(struct window *window, void *data);
void void
input_set_pointer_image(struct input *input, uint32_t time, int pointer); input_set_pointer_image(struct input *input, int pointer);
void void
input_get_position(struct input *input, int32_t *x, int32_t *y); input_get_position(struct input *input, int32_t *x, int32_t *y);