mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split image_surface handling into own function

This commit is contained in:
Brian Ashworth 2018-12-19 18:22:56 -05:00 committed by emersion
parent 5fca74a1f1
commit 3248c823ed
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sway/input/cursor.h
View File

@ -73,6 +73,10 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
void cursor_set_image(struct sway_cursor *cursor, const char *image, void cursor_set_image(struct sway_cursor *cursor, const char *image,
struct wl_client *client); struct wl_client *client);
void cursor_set_image_surface(struct sway_cursor *cursor,
struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y,
struct wl_client *client);
void cursor_warp_to_container(struct sway_cursor *cursor, void cursor_warp_to_container(struct sway_cursor *cursor,
struct sway_container *container); struct sway_container *container);

54
sway/input/cursor.c
View File

@ -603,7 +603,15 @@ static void handle_activity(struct sway_cursor *cursor) {
wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat);
if (cursor->hidden) { if (cursor->hidden) {
cursor->hidden = false; cursor->hidden = false;
cursor_set_image(cursor, NULL, cursor->image_client); if (cursor->image_surface) {
cursor_set_image_surface(cursor, cursor->image_surface,
cursor->hotspot_x, cursor->hotspot_y,
cursor->image_client);
} else {
const char *image = cursor->image;
cursor->image = NULL;
cursor_set_image(cursor, image, cursor->image_client);
}
} }
} }
@ -1297,12 +1305,8 @@ static void handle_request_set_cursor(struct wl_listener *listener,
return; return;
} }
cursor->image = NULL; cursor_set_image_surface(cursor, event->surface, event->hotspot_x,
cursor->image_client = focused_client; event->hotspot_y, focused_client);
cursor->image_surface = event->surface;
cursor->hotspot_x = event->hotspot_x;
cursor->hotspot_y = event->hotspot_y;
cursor_set_image(cursor, NULL, cursor->image_client);
} }
void cursor_set_image(struct sway_cursor *cursor, const char *image, void cursor_set_image(struct sway_cursor *cursor, const char *image,
@ -1310,21 +1314,43 @@ void cursor_set_image(struct sway_cursor *cursor, const char *image,
if (!(cursor->seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) { if (!(cursor->seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
return; return;
} }
const char *current_image = cursor->image;
cursor->image = image;
cursor->image_surface = NULL;
cursor->hotspot_x = cursor->hotspot_y = 0;
cursor->image_client = client;
if (cursor->hidden) { if (cursor->hidden) {
return; return;
} }
if (!image && cursor->image_surface) {
wlr_cursor_set_surface(cursor->cursor, cursor->image_surface, if (!image) {
cursor->hotspot_x, cursor->hotspot_y);
} else if (!image) {
wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
} else if (!cursor->image || strcmp(cursor->image, image) != 0) { } else if (!current_image || strcmp(current_image, image) != 0) {
cursor->image_surface = NULL;
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image, wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
cursor->cursor); cursor->cursor);
} }
cursor->image = image; }
void cursor_set_image_surface(struct sway_cursor *cursor,
struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y,
struct wl_client *client) {
if (!(cursor->seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
return;
}
cursor->image = NULL;
cursor->image_surface = surface;
cursor->hotspot_x = hotspot_x;
cursor->hotspot_y = hotspot_y;
cursor->image_client = client; cursor->image_client = client;
if (cursor->hidden) {
return;
}
wlr_cursor_set_surface(cursor->cursor, surface, hotspot_x, hotspot_y);
} }
void sway_cursor_destroy(struct sway_cursor *cursor) { void sway_cursor_destroy(struct sway_cursor *cursor) {