diff options
Diffstat (limited to 'wayland/window.c')
-rw-r--r-- | wayland/window.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/wayland/window.c b/wayland/window.c index 3f48d39f..8a506656 100644 --- a/wayland/window.c +++ b/wayland/window.c | |||
@@ -93,11 +93,13 @@ void window_make_shell(struct window *window) { | |||
93 | wl_shell_surface_set_toplevel(window->shell_surface); | 93 | wl_shell_surface_set_toplevel(window->shell_surface); |
94 | } | 94 | } |
95 | 95 | ||
96 | struct window *window_setup(struct registry *registry, uint32_t width, uint32_t height, bool shell_surface) { | 96 | struct window *window_setup(struct registry *registry, uint32_t width, uint32_t height, |
97 | int32_t scale, bool shell_surface) { | ||
97 | struct window *window = malloc(sizeof(struct window)); | 98 | struct window *window = malloc(sizeof(struct window)); |
98 | memset(window, 0, sizeof(struct window)); | 99 | memset(window, 0, sizeof(struct window)); |
99 | window->width = width; | 100 | window->width = width; |
100 | window->height = height; | 101 | window->height = height; |
102 | window->scale = scale; | ||
101 | window->registry = registry; | 103 | window->registry = registry; |
102 | window->font = "monospace 10"; | 104 | window->font = "monospace 10"; |
103 | 105 | ||
@@ -121,15 +123,18 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t | |||
121 | cursor_size = "16"; | 123 | cursor_size = "16"; |
122 | } | 124 | } |
123 | 125 | ||
126 | sway_log(L_DEBUG, "Cursor scale: %d", scale); | ||
124 | window->cursor.cursor_theme = wl_cursor_theme_load(cursor_theme, | 127 | window->cursor.cursor_theme = wl_cursor_theme_load(cursor_theme, |
125 | atoi(cursor_size), registry->shm); | 128 | atoi(cursor_size) * scale, registry->shm); |
126 | window->cursor.cursor = wl_cursor_theme_get_cursor(window->cursor.cursor_theme, "left_ptr"); | 129 | window->cursor.cursor = wl_cursor_theme_get_cursor(window->cursor.cursor_theme, "left_ptr"); |
127 | window->cursor.surface = wl_compositor_create_surface(registry->compositor); | 130 | window->cursor.surface = wl_compositor_create_surface(registry->compositor); |
128 | 131 | ||
129 | struct wl_cursor_image *image = window->cursor.cursor->images[0]; | 132 | struct wl_cursor_image *image = window->cursor.cursor->images[0]; |
130 | struct wl_buffer *cursor_buf = wl_cursor_image_get_buffer(image); | 133 | struct wl_buffer *cursor_buf = wl_cursor_image_get_buffer(image); |
131 | wl_surface_attach(window->cursor.surface, cursor_buf, 0, 0); | 134 | wl_surface_attach(window->cursor.surface, cursor_buf, 0, 0); |
132 | wl_surface_damage(window->cursor.surface, 0, 0, image->width, image->height); | 135 | wl_surface_set_buffer_scale(window->cursor.surface, scale); |
136 | wl_surface_damage(window->cursor.surface, 0, 0, | ||
137 | image->width, image->height); | ||
133 | wl_surface_commit(window->cursor.surface); | 138 | wl_surface_commit(window->cursor.surface); |
134 | } | 139 | } |
135 | 140 | ||
@@ -159,8 +164,9 @@ int window_render(struct window *window) { | |||
159 | window->frame_cb = wl_surface_frame(window->surface); | 164 | window->frame_cb = wl_surface_frame(window->surface); |
160 | wl_callback_add_listener(window->frame_cb, &listener, window); | 165 | wl_callback_add_listener(window->frame_cb, &listener, window); |
161 | 166 | ||
162 | wl_surface_damage(window->surface, 0, 0, window->buffer->width, window->buffer->height); | ||
163 | wl_surface_attach(window->surface, window->buffer->buffer, 0, 0); | 167 | wl_surface_attach(window->surface, window->buffer->buffer, 0, 0); |
168 | wl_surface_set_buffer_scale(window->surface, window->scale); | ||
169 | wl_surface_damage(window->surface, 0, 0, window->width, window->height); | ||
164 | wl_surface_commit(window->surface); | 170 | wl_surface_commit(window->surface); |
165 | 171 | ||
166 | return 1; | 172 | return 1; |