mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: wlr_input_device refactor

Browse source 
To update the wlroots subproject use
meson subprojects update wlroots

Chases wlroots 91943a68a6976ef7c4cc70afc07954a00fae678b
wlr_input_device: remove anon union field

Fixes #415
This commit is contained in:
Consolatis 2022-06-25 15:57:04 +02:00 • committed by Johan Malm
parent 437230b3a0
commit a3d3878d28
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/seat.c
View file

@ -4,6 +4,9 @@
#include <strings.h> #include <strings.h>
#include <wlr/backend/libinput.h> #include <wlr/backend/libinput.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_pointer.h>
#include <wlr/types/wlr_touch.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "labwc.h" #include "labwc.h"
@ -150,11 +153,11 @@ new_pointer(struct seat *seat, struct input *input)
/* In support of running with WLR_WL_OUTPUTS set to >=2 */ /* In support of running with WLR_WL_OUTPUTS set to >=2 */
if (dev->type == WLR_INPUT_DEVICE_POINTER) { if (dev->type == WLR_INPUT_DEVICE_POINTER) {
wlr_log(WLR_INFO, "map pointer to output %s\n",
dev->pointer->output_name);
struct wlr_output *output = NULL; struct wlr_output *output = NULL;
if (dev->pointer->output_name) { struct wlr_pointer *pointer = wlr_pointer_from_input_device(dev);
output = output_by_name(seat->server, dev->pointer->output_name); wlr_log(WLR_INFO, "map pointer to output %s\n", pointer->output_name);
if (pointer->output_name) {
output = output_by_name(seat->server, pointer->output_name);
} }
wlr_cursor_map_input_to_output(seat->cursor, dev, output); wlr_cursor_map_input_to_output(seat->cursor, dev, output);
wlr_cursor_map_input_to_region(seat->cursor, dev, NULL); wlr_cursor_map_input_to_region(seat->cursor, dev, NULL);
@ -164,7 +167,8 @@ new_pointer(struct seat *seat, struct input *input)
void void
new_keyboard(struct seat *seat, struct input *input) new_keyboard(struct seat *seat, struct input *input)
{ {
struct wlr_keyboard *kb = input->wlr_input_device->keyboard; struct wlr_keyboard *kb =
wlr_keyboard_from_input_device(input->wlr_input_device);
wlr_keyboard_set_keymap(kb, seat->keyboard_group->keyboard.keymap); wlr_keyboard_set_keymap(kb, seat->keyboard_group->keyboard.keymap);
wlr_keyboard_group_add_keyboard(seat->keyboard_group, kb); wlr_keyboard_group_add_keyboard(seat->keyboard_group, kb);
wlr_seat_set_keyboard(seat->seat, kb); wlr_seat_set_keyboard(seat->seat, kb);
@ -181,11 +185,11 @@ new_touch(struct seat *seat, struct input *input)
/* In support of running with WLR_WL_OUTPUTS set to >=2 */ /* In support of running with WLR_WL_OUTPUTS set to >=2 */
if (dev->type == WLR_INPUT_DEVICE_TOUCH) { if (dev->type == WLR_INPUT_DEVICE_TOUCH) {
wlr_log(WLR_INFO, "map touch to output %s\n",
dev->pointer->output_name);
struct wlr_output *output = NULL; struct wlr_output *output = NULL;
if (dev->pointer->output_name) { struct wlr_touch *touch = wlr_touch_from_input_device(dev);
output = output_by_name(seat->server, dev->pointer->output_name); wlr_log(WLR_INFO, "map touch to output %s\n", touch->output_name);
if (touch->output_name) {
output = output_by_name(seat->server, touch->output_name);
} }
wlr_cursor_map_input_to_output(seat->cursor, dev, output); wlr_cursor_map_input_to_output(seat->cursor, dev, output);
wlr_cursor_map_input_to_region(seat->cursor, dev, NULL); wlr_cursor_map_input_to_region(seat->cursor, dev, NULL);

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = d57d2e0e368bbf0b94246a3f6dbeb26c7b048993 revision = c20468cfa292e99357fd504fc5b5884f6078ca96
[provide] [provide]
dependency_names = wlroots dependency_names = wlroots