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

fix: configure error device when createdevice

Browse source
This commit is contained in:
DreamMaoMao 2025-09-15 15:38:48 +08:00
parent a6d0ae8d21
commit f826bc1fba
1 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/mango.c
View file

@ -2780,22 +2780,24 @@ void configure_pointer(struct libinput_device *device) {
} }
void createpointer(struct wlr_pointer *pointer) { void createpointer(struct wlr_pointer *pointer) {
struct libinput_device *device =
wlr_libinput_get_device_handle(&pointer->base);
if (device && wlr_input_device_is_libinput(&pointer->base)) { struct libinput_device *device = NULL;
if (wlr_input_device_is_libinput(&pointer->base) &&
(device = wlr_libinput_get_device_handle(&pointer->base))) {
configure_pointer(device); configure_pointer(device);
InputDevice *input_dev = calloc(1, sizeof(InputDevice));
input_dev->wlr_device = &pointer->base;
input_dev->libinput_device = device;
input_dev->destroy_listener.notify = destroyinputdevice;
wl_signal_add(&pointer->base.events.destroy,
&input_dev->destroy_listener);
wl_list_insert(&inputdevices, &input_dev->link);
} }
InputDevice *input_dev = calloc(1, sizeof(InputDevice));
input_dev->wlr_device = &pointer->base;
input_dev->libinput_device = device;
input_dev->destroy_listener.notify = destroyinputdevice;
wl_signal_add(&pointer->base.events.destroy, &input_dev->destroy_listener);
wl_list_insert(&inputdevices, &input_dev->link);
wlr_cursor_attach_input_device(cursor, &pointer->base); wlr_cursor_attach_input_device(cursor, &pointer->base);
} }
@ -2820,32 +2822,36 @@ void switch_toggle(struct wl_listener *listener, void *data) {
} }
void createswitch(struct wlr_switch *switch_device) { void createswitch(struct wlr_switch *switch_device) {
struct libinput_device *device =
wlr_libinput_get_device_handle(&switch_device->base);
InputDevice *input_dev = calloc(1, sizeof(InputDevice)); struct libinput_device *device = NULL;
input_dev->wlr_device = &switch_device->base;
input_dev->libinput_device = device;
input_dev->device_data = NULL; // 初始化为 NULL
input_dev->destroy_listener.notify = destroyinputdevice; if (wlr_input_device_is_libinput(&switch_device->base) &&
wl_signal_add(&switch_device->base.events.destroy, (device = wlr_libinput_get_device_handle(&switch_device->base))) {
&input_dev->destroy_listener);
// 创建 Switch 特定数据 InputDevice *input_dev = calloc(1, sizeof(InputDevice));
Switch *sw = calloc(1, sizeof(Switch)); input_dev->wlr_device = &switch_device->base;
sw->wlr_switch = switch_device; input_dev->libinput_device = device;
sw->toggle.notify = switch_toggle; input_dev->device_data = NULL; // 初始化为 NULL
sw->input_dev = input_dev;
// 将 Switch 指针保存到 input_device 中 input_dev->destroy_listener.notify = destroyinputdevice;
input_dev->device_data = sw; wl_signal_add(&switch_device->base.events.destroy,
&input_dev->destroy_listener);
// 添加 toggle 监听器 // 创建 Switch 特定数据
wl_signal_add(&switch_device->events.toggle, &sw->toggle); Switch *sw = calloc(1, sizeof(Switch));
sw->wlr_switch = switch_device;
sw->toggle.notify = switch_toggle;
sw->input_dev = input_dev;
// 添加到全局列表 // 将 Switch 指针保存到 input_device 中
wl_list_insert(&inputdevices, &input_dev->link); input_dev->device_data = sw;
// 添加 toggle 监听器
wl_signal_add(&switch_device->events.toggle, &sw->toggle);
// 添加到全局列表
wl_list_insert(&inputdevices, &input_dev->link);
}
} }
void createpointerconstraint(struct wl_listener *listener, void *data) { void createpointerconstraint(struct wl_listener *listener, void *data) {