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

Merge pull request #1678 from emersion/xwayland-xcursor

Browse source 
Set xwayland cursor
This commit is contained in:
Drew DeVault 2018-03-31 00:35:50 -04:00 committed by GitHub
parent 18173fb5ad b237fa0b22
commit 6a1a94b87c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/server.h
View file

@ -33,6 +33,7 @@ struct sway_server {
struct wl_listener xdg_shell_v6_surface; struct wl_listener xdg_shell_v6_surface;
struct wlr_xwayland *xwayland; struct wlr_xwayland *xwayland;
struct wlr_xcursor_manager *xcursor_manager;
struct wl_listener xwayland_surface; struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready; struct wl_listener xwayland_ready;

4
sway/input/seat.c
View file

@ -259,11 +259,11 @@ void sway_seat_remove_device(struct sway_seat *seat,
void sway_seat_configure_xcursor(struct sway_seat *seat) { void sway_seat_configure_xcursor(struct sway_seat *seat) {
// TODO configure theme and size // TODO configure theme and size
const char *cursor_theme = "default"; const char *cursor_theme = NULL;
if (!seat->cursor->xcursor_manager) { if (!seat->cursor->xcursor_manager) {
seat->cursor->xcursor_manager = seat->cursor->xcursor_manager =
wlr_xcursor_manager_create("default", 24); wlr_xcursor_manager_create(cursor_theme, 24);
if (sway_assert(seat->cursor->xcursor_manager, if (sway_assert(seat->cursor->xcursor_manager,
"Cannot create XCursor manager for theme %s", "Cannot create XCursor manager for theme %s",
cursor_theme)) { cursor_theme)) {

13
sway/server.c
View file

@ -11,6 +11,7 @@
#include <wlr/types/wlr_layer_shell.h> #include <wlr/types/wlr_layer_shell.h>
#include <wlr/types/wlr_screenshooter.h> #include <wlr/types/wlr_screenshooter.h>
#include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
// TODO WLR: make Xwayland optional // TODO WLR: make Xwayland optional
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
@ -78,6 +79,18 @@ bool server_init(struct sway_server *server) {
// TODO: call server_ready now if xwayland is not enabled // TODO: call server_ready now if xwayland is not enabled
server->xwayland_ready.notify = server_ready; server->xwayland_ready.notify = server_ready;
// TODO: configurable cursor theme and size
server->xcursor_manager = wlr_xcursor_manager_create(NULL, 24);
wlr_xcursor_manager_load(server->xcursor_manager, 1);
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
server->xcursor_manager, "left_ptr", 1);
if (xcursor != NULL) {
struct wlr_xcursor_image *image = xcursor->images[0];
wlr_xwayland_set_cursor(server->xwayland, image->buffer,
image->width * 4, image->width, image->height, image->hotspot_x,
image->hotspot_y);
}
server->wl_shell = wlr_wl_shell_create(server->wl_display); server->wl_shell = wlr_wl_shell_create(server->wl_display);
wl_signal_add(&server->wl_shell->events.new_surface, wl_signal_add(&server->wl_shell->events.new_surface,
&server->wl_shell_surface); &server->wl_shell_surface);