alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove pointer from swaylock surface

Browse source
This commit is contained in:
Drew DeVault 2016-01-26 18:38:05 -05:00
parent f1f4791a3b
commit baa958eaf2
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
swaylock/main.c
View file

@ -283,6 +283,12 @@ int main(int argc, char **argv) {
sway_abort("swaylock requires the compositor to support the swaylock extension."); sway_abort("swaylock requires the compositor to support the swaylock extension.");
} }
if (registry->pointer) {
// We don't want swaylock to have a pointer
wl_pointer_destroy(registry->pointer);
registry->pointer = NULL;
}
int i; int i;
for (i = 0; i < registry->outputs->length; ++i) { for (i = 0; i < registry->outputs->length; ++i) {
struct output_state *output = registry->outputs->items[i]; struct output_state *output = registry->outputs->items[i];

24
wayland/window.c
View file

@ -18,8 +18,10 @@
static void pointer_handle_enter(void *data, struct wl_pointer *pointer, static void pointer_handle_enter(void *data, struct wl_pointer *pointer,
uint32_t serial, struct wl_surface *surface, wl_fixed_t sx_w, wl_fixed_t sy_w) { uint32_t serial, struct wl_surface *surface, wl_fixed_t sx_w, wl_fixed_t sy_w) {
struct window *window = data; struct window *window = data;
struct wl_cursor_image *image = window->cursor.cursor->images[0]; if (window->registry->pointer) {
wl_pointer_set_cursor(pointer, serial, window->cursor.surface, image->hotspot_x, image->hotspot_y); struct wl_cursor_image *image = window->cursor.cursor->images[0];
wl_pointer_set_cursor(pointer, serial, window->cursor.surface, image->hotspot_x, image->hotspot_y);
}
} }
static void pointer_handle_leave(void *data, struct wl_pointer *pointer, static void pointer_handle_leave(void *data, struct wl_pointer *pointer,
@ -77,15 +79,17 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t
get_next_buffer(window); get_next_buffer(window);
window->cursor.cursor_theme = wl_cursor_theme_load("default", 32, registry->shm); // TODO: let you customize this if (registry->pointer) {
window->cursor.cursor = wl_cursor_theme_get_cursor(window->cursor.cursor_theme, "left_ptr"); window->cursor.cursor_theme = wl_cursor_theme_load("default", 32, registry->shm); // TODO: let you customize this
window->cursor.surface = wl_compositor_create_surface(registry->compositor); window->cursor.cursor = wl_cursor_theme_get_cursor(window->cursor.cursor_theme, "left_ptr");
window->cursor.surface = wl_compositor_create_surface(registry->compositor);
struct wl_cursor_image *image = window->cursor.cursor->images[0]; struct wl_cursor_image *image = window->cursor.cursor->images[0];
struct wl_buffer *cursor_buf = wl_cursor_image_get_buffer(image); struct wl_buffer *cursor_buf = wl_cursor_image_get_buffer(image);
wl_surface_attach(window->cursor.surface, cursor_buf, 0, 0); wl_surface_attach(window->cursor.surface, cursor_buf, 0, 0);
wl_surface_damage(window->cursor.surface, 0, 0, image->width, image->height); wl_surface_damage(window->cursor.surface, 0, 0, image->width, image->height);
wl_surface_commit(window->cursor.surface); wl_surface_commit(window->cursor.surface);
}
return window; return window;
} }