mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-27 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into hidpi

Browse source
This commit is contained in:
Drew DeVault 2017-11-02 23:34:02 -04:00
commit 86b8729998
48 changed files with 499 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rootston/config.c
View file

@ -232,7 +232,9 @@ static int config_ini_handler(void *user, const char *section, const char *name,
oc->scale = strtol(value, NULL, 10);
assert(oc->scale >= 1);
} else if (strcmp(name, "rotate") == 0) {
if (strcmp(value, "90") == 0) {
if (strcmp(value, "normal") == 0) {
oc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
} else if (strcmp(value, "90") == 0) {
oc->transform = WL_OUTPUT_TRANSFORM_90;
} else if (strcmp(value, "180") == 0) {
oc->transform = WL_OUTPUT_TRANSFORM_180;

9
rootston/input.c
View file

@ -4,6 +4,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/util/log.h>
#include <wlr/xcursor.h>
#include <wlr/xwayland.h>
#include "rootston/server.h"
#include "rootston/config.h"
#include "rootston/input.h"
@ -96,6 +97,14 @@ struct roots_input *input_create(struct roots_server *server,
return NULL;
}
if (server->desktop->xwayland != NULL) {
struct wlr_xcursor_image *xcursor_image = xcursor->images[0];
wlr_xwayland_set_cursor(server->desktop->xwayland,
xcursor_image->buffer, xcursor_image->width, xcursor_image->width,
xcursor_image->height, xcursor_image->hotspot_x,
xcursor_image->hotspot_y);
}
input->wl_seat = wlr_seat_create(server->wl_display, "seat0");
if (input->wl_seat == NULL) {
wlr_log(L_ERROR, "Cannot create seat");