diff --git a/src/config/parse_config.h b/src/config/parse_config.h index 4356f612..c8170f52 100644 --- a/src/config/parse_config.h +++ b/src/config/parse_config.h @@ -294,6 +294,8 @@ typedef struct { double axis_scroll_factor; + char *tablet_map_to_mon; + int32_t blur; int32_t blur_layer; int32_t blur_optimized; @@ -1703,6 +1705,10 @@ bool parse_option(Config *config, char *key, char *value) { config->button_map = atoi(value); } else if (strcmp(key, "axis_scroll_factor") == 0) { config->axis_scroll_factor = atof(value); + } else if (strcmp(key, "tablet_map_to_mon") == 0) { + if (config->tablet_map_to_mon) + free(config->tablet_map_to_mon); + config->tablet_map_to_mon = strdup(value); } else if (strcmp(key, "gappih") == 0) { config->gappih = atoi(value); } else if (strcmp(key, "gappiv") == 0) { @@ -3129,6 +3135,11 @@ void free_config(void) { config.cursor_theme = NULL; } + if (config.tablet_map_to_mon) { + free(config.tablet_map_to_mon); + config.tablet_map_to_mon = NULL; + } + // 释放 circle_layout free_circle_layout(&config); @@ -3556,6 +3567,7 @@ bool parse_config(void) { config.tag_rules = NULL; config.tag_rules_count = 0; config.cursor_theme = NULL; + config.tablet_map_to_mon = NULL; strcpy(config.keymode, "default"); create_config_keymap(); diff --git a/src/ext-protocol/all.h b/src/ext-protocol/all.h index bc690fe7..6fdb0744 100644 --- a/src/ext-protocol/all.h +++ b/src/ext-protocol/all.h @@ -2,4 +2,5 @@ #include "ext-workspace.h" #include "foreign-toplevel.h" #include "tearing.h" -#include "text-input.h" \ No newline at end of file +#include "text-input.h" +#include "tablet.h" diff --git a/src/ext-protocol/tablet.h b/src/ext-protocol/tablet.h new file mode 100644 index 00000000..6aa7ae86 --- /dev/null +++ b/src/ext-protocol/tablet.h @@ -0,0 +1,439 @@ +#include +#include +#include + +static void createtablet(struct wlr_input_device *device); +static void destroytablet(struct wl_listener *listener, void *data); +static void createtabletpad(struct wlr_input_device *device); +static void destroytabletpad(struct wl_listener *listener, void *data); +static void tabletpadtabletdestroy(struct wl_listener *listener, void *data); +static void tabletpadattach(struct wl_listener *listener, void *data); +static void destroytabletsurfacenotify(struct wl_listener *listener, + void *data); +static void destroytablettool(struct wl_listener *listener, void *data); +static void tablettoolsetcursor(struct wl_listener *listener, void *data); + +static void tablettoolproximity(struct wl_listener *listener, void *data); +static void tablettoolaxis(struct wl_listener *listener, void *data); +static void tablettoolbutton(struct wl_listener *listener, void *data); +static void tablettooltip(struct wl_listener *listener, void *data); +static struct wlr_tablet_manager_v2 *tablet_mgr; + +struct Tablet { + struct wlr_tablet_v2_tablet *tablet_v2; + struct wl_listener destroy; + struct wl_list link; +}; +static struct wl_list tablets; + +struct TabletTool { + struct wlr_tablet_v2_tablet_tool *tool_v2; + struct Tablet *tablet; + struct wlr_surface *curr_surface; + struct wl_listener destroy; + struct wl_listener surface_destroy; + struct wl_listener set_cursor; + double tilt_x, tilt_y; +}; + +struct TabletPad { + struct wlr_tablet_v2_tablet_pad *pad_v2; + struct Tablet *tablet; + struct wl_listener tablet_destroy; + struct wl_listener attach; + struct wl_listener destroy; + struct wl_list link; +}; +static struct wl_list tablet_pads; + +static void attach_tablet_pad(struct TabletPad *tablet_pad, + struct Tablet *tablet); +static void tablettoolmotion(struct TabletTool *tool, bool change_x, + bool change_y, double x, double y, double dx, + double dy); + +static struct wl_listener tablet_tool_axis = {.notify = tablettoolaxis}; +static struct wl_listener tablet_tool_button = {.notify = tablettoolbutton}; +static struct wl_listener tablet_tool_proximity = {.notify = + tablettoolproximity}; +static struct wl_listener tablet_tool_tip = {.notify = tablettooltip}; + +void createtablet(struct wlr_input_device *device) { + struct Tablet *tablet = calloc(1, sizeof(struct Tablet)); + if (!tablet) { + wlr_log(WLR_ERROR, "could not allocate tablet"); + return; + } + + struct libinput_device *device_handle = NULL; + if (!wlr_input_device_is_libinput(device) || + !(device_handle = wlr_libinput_get_device_handle(device))) { + free(tablet); + return; + } + + tablet->tablet_v2 = wlr_tablet_create(tablet_mgr, seat, device); + tablet->tablet_v2->wlr_tablet->data = tablet; + tablet->destroy.notify = destroytablet; + wl_signal_add(&tablet->tablet_v2->wlr_device->events.destroy, + &tablet->destroy); + if (libinput_device_config_send_events_get_modes(device_handle)) { + libinput_device_config_send_events_set_mode(device_handle, + config.send_events_mode); + wlr_cursor_attach_input_device(cursor, device); + } + + wl_list_insert(&tablets, &tablet->link); + + /* Search for a sibling tablet pad */ + struct libinput_device_group *group = libinput_device_get_device_group( + wlr_libinput_get_device_handle(device)); + struct TabletPad *tablet_pad; + wl_list_for_each(tablet_pad, &tablet_pads, link) { + struct wlr_input_device *pad_device = tablet_pad->pad_v2->wlr_device; + if (!wlr_input_device_is_libinput(pad_device)) { + continue; + } + + struct libinput_device_group *pad_group = + libinput_device_get_device_group( + wlr_libinput_get_device_handle(pad_device)); + + if (pad_group == group) { + attach_tablet_pad(tablet_pad, tablet); + break; + } + } +} + +void destroytablet(struct wl_listener *listener, void *data) { + struct Tablet *tablet = wl_container_of(listener, tablet, destroy); + + wl_list_remove(&listener->link); + wl_list_remove(&tablet->link); + free(tablet); +} + +void tabletpadtabletdestroy(struct wl_listener *listener, void *data) { + struct TabletPad *tablet_pad = + wl_container_of(listener, tablet_pad, tablet_destroy); + + tablet_pad->tablet = NULL; + + wl_list_remove(&tablet_pad->tablet_destroy.link); + wl_list_init(&tablet_pad->tablet_destroy.link); +} + +void attach_tablet_pad(struct TabletPad *tablet_pad, struct Tablet *tablet) { + tablet_pad->tablet = tablet; + + wl_list_remove(&tablet_pad->tablet_destroy.link); + tablet_pad->tablet_destroy.notify = tabletpadtabletdestroy; + wl_signal_add(&tablet->tablet_v2->wlr_device->events.destroy, + &tablet_pad->tablet_destroy); +} + +void tabletpadattach(struct wl_listener *listener, void *data) { + struct TabletPad *tablet_pad = + wl_container_of(listener, tablet_pad, attach); + struct wlr_tablet_tool *wlr_tool = data; + struct TabletTool *tool = wlr_tool->data; + + if (!tool) { + return; + } + + attach_tablet_pad(tablet_pad, tool->tablet); +} + +void createtabletpad(struct wlr_input_device *device) { + struct TabletPad *tablet_pad = calloc(1, sizeof(struct TabletPad)); + if (!tablet_pad) { + wlr_log(WLR_ERROR, "could not allocate tablet_pad"); + return; + } + tablet_pad->pad_v2 = wlr_tablet_pad_create(tablet_mgr, seat, device); + tablet_pad->destroy.notify = destroytabletpad; + tablet_pad->attach.notify = tabletpadattach; + wl_list_init(&tablet_pad->tablet_destroy.link); + wl_signal_add(&tablet_pad->pad_v2->wlr_device->events.destroy, + &tablet_pad->destroy); + wl_signal_add(&tablet_pad->pad_v2->wlr_pad->events.attach_tablet, + &tablet_pad->attach); + wl_list_insert(&tablet_pads, &tablet_pad->link); + + /* Search for a sibling tablet */ + if (!wlr_input_device_is_libinput(tablet_pad->pad_v2->wlr_device)) { + /* We can only do this on libinput devices */ + return; + } + + struct libinput_device_group *group = libinput_device_get_device_group( + wlr_libinput_get_device_handle(tablet_pad->pad_v2->wlr_device)); + struct Tablet *tablet; + wl_list_for_each(tablet, &tablets, link) { + struct wlr_input_device *tablet_device = tablet->tablet_v2->wlr_device; + if (!wlr_input_device_is_libinput(tablet_device)) { + continue; + } + + struct libinput_device_group *tablet_group = + libinput_device_get_device_group( + wlr_libinput_get_device_handle(tablet_device)); + + if (tablet_group == group) { + attach_tablet_pad(tablet_pad, tablet); + break; + } + } +} + +void destroytabletpad(struct wl_listener *listener, void *data) { + struct TabletPad *tablet_pad = + wl_container_of(listener, tablet_pad, destroy); + + wl_list_remove(&listener->link); + wl_list_remove(&tablet_pad->link); + wl_list_remove(&tablet_pad->tablet_destroy.link); + wl_list_remove(&tablet_pad->attach.link); + free(tablet_pad); +} + +void destroytabletsurfacenotify(struct wl_listener *listener, void *data) { + struct TabletTool *tool = wl_container_of(listener, tool, surface_destroy); + wl_list_remove(&tool->surface_destroy.link); + tool->curr_surface = NULL; +} + +void destroytablettool(struct wl_listener *listener, void *data) { + struct TabletTool *tool = wl_container_of(listener, tool, destroy); + + if (tool->curr_surface) + wl_list_remove(&tool->surface_destroy.link); + wl_list_remove(&tool->set_cursor.link); + wl_list_remove(&listener->link); + free(tool); +} + +static void tablettoolsetcursor(struct wl_listener *listener, void *data) { + struct TabletTool *tool = wl_container_of(listener, tool, set_cursor); + struct wlr_tablet_v2_event_cursor *event = data; + + struct wlr_seat_client *focused_client = NULL; + if (tool->tool_v2->focused_surface) { + focused_client = wlr_seat_client_for_wl_client( + seat, + wl_resource_get_client(tool->tool_v2->focused_surface->resource)); + } + + if (focused_client != event->seat_client) + return; + + wlr_cursor_set_surface(cursor, event->surface, event->hotspot_x, + event->hotspot_y); +} + +void tablettoolmotion(struct TabletTool *tool, bool change_x, bool change_y, + double x, double y, double dx, double dy) { + struct wlr_surface *surface = NULL; + Client *c = NULL, *w = NULL; + LayerSurface *l = NULL; + struct Tablet *tablet = tool->tablet; + struct TabletPad *tablet_pad; + double sx, sy; + + if (!change_x && !change_y) + return; + + // TODO: apply constraints + switch (tool->tool_v2->wlr_tool->type) { + case WLR_TABLET_TOOL_TYPE_LENS: + case WLR_TABLET_TOOL_TYPE_MOUSE: + wlr_cursor_move(cursor, tablet->tablet_v2->wlr_device, dx, dy); + break; + default: + wlr_cursor_warp_absolute(cursor, tablet->tablet_v2->wlr_device, + change_x ? x : NAN, change_y ? y : NAN); + break; + } + + motionnotify(0, NULL, 0, 0, 0, 0); + + if (config.sloppyfocus) + selmon = xytomon(cursor->x, cursor->y); + + xytonode(cursor->x, cursor->y, &surface, &c, NULL, &sx, &sy); + if (cursor_mode == CurPressed && !seat->drag && + surface != seat->pointer_state.focused_surface && + toplevel_from_wlr_surface(seat->pointer_state.focused_surface, &w, + &l) >= 0) { + c = w; + surface = seat->pointer_state.focused_surface; + sx = cursor->x - (l ? l->scene->node.x : w->geom.x); + sy = cursor->y - (l ? l->scene->node.y : w->geom.y); + } + + if (config.sloppyfocus && c && c->scene->node.enabled && + (surface != seat->pointer_state.focused_surface || + (selmon && selmon->sel && c != selmon->sel)) && + !client_is_unmanaged(c)) + focusclient(c, 0); + + if (surface && !wlr_surface_accepts_tablet_v2(surface, tablet->tablet_v2)) + surface = NULL; + + if (surface != tool->curr_surface) { + if (tool->curr_surface) { + // TODO: wait until all buttons released before leaving + wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tool_v2); + wl_list_for_each(tablet_pad, &tablet_pads, link) { + if (tablet_pad->tablet && tablet_pad->tablet == tablet) + wlr_tablet_v2_tablet_pad_notify_leave(tablet_pad->pad_v2, + tool->curr_surface); + } + wl_list_remove(&tool->surface_destroy.link); + } + if (surface) { + wl_list_for_each(tablet_pad, &tablet_pads, link) { + if (tablet_pad->tablet && tablet_pad->tablet == tablet) + wlr_tablet_v2_tablet_pad_notify_enter( + tablet_pad->pad_v2, tablet->tablet_v2, surface); + } + wlr_tablet_v2_tablet_tool_notify_proximity_in( + tool->tool_v2, tablet->tablet_v2, surface); + wl_signal_add(&surface->events.destroy, &tool->surface_destroy); + } + tool->curr_surface = surface; + } + + if (surface) + wlr_tablet_v2_tablet_tool_notify_motion(tool->tool_v2, sx, sy); + + wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); + handlecursoractivity(); +} + +void tablettoolproximity(struct wl_listener *listener, void *data) { + struct wlr_tablet_tool_proximity_event *event = data; + struct wlr_tablet_tool *wlr_tool = event->tool; + struct TabletTool *tool = wlr_tool->data; + Monitor *m_iter; + + if (!tool) { + tool = calloc(1, sizeof(struct TabletTool)); + if (!tool) { + wlr_log(WLR_ERROR, "could not allocate tablet_tool"); + return; + } + tool->tool_v2 = wlr_tablet_tool_create(tablet_mgr, seat, wlr_tool); + tool->surface_destroy.notify = destroytabletsurfacenotify; + tool->destroy.notify = destroytablettool; + tool->set_cursor.notify = tablettoolsetcursor; + tool->tablet = event->tablet->data; + wlr_tool->data = tool; + wl_signal_add(&tool->tool_v2->wlr_tool->events.destroy, &tool->destroy); + wl_signal_add(&tool->tool_v2->events.set_cursor, &tool->set_cursor); + + if (config.tablet_map_to_mon) { + wl_list_for_each(m_iter, &mons, link) { + if (match_monitor_spec(config.tablet_map_to_mon, m_iter)) { + wlr_log(WLR_DEBUG, "Mapping tablet %s to output %s", + event->tablet->base.name, config.tablet_map_to_mon); + wlr_cursor_map_input_to_output(cursor, &event->tablet->base, + m_iter->wlr_output); + break; + } + } + } + } + + switch (event->state) { + case WLR_TABLET_TOOL_PROXIMITY_OUT: + wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tool_v2); + if (tool->curr_surface) + wl_list_remove(&tool->surface_destroy.link); + tool->curr_surface = NULL; + break; + case WLR_TABLET_TOOL_PROXIMITY_IN: + tablettoolmotion(tool, true, true, event->x, event->y, 0, 0); + break; + } +} + +void tablettoolaxis(struct wl_listener *listener, void *data) { + struct wlr_tablet_tool_axis_event *event = data; + struct TabletTool *tool = event->tool->data; + if (!tool) + return; + + tablettoolmotion(tool, event->updated_axes & WLR_TABLET_TOOL_AXIS_X, + event->updated_axes & WLR_TABLET_TOOL_AXIS_Y, event->x, + event->y, event->dx, event->dy); + + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) + wlr_tablet_v2_tablet_tool_notify_pressure(tool->tool_v2, + event->pressure); + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) + wlr_tablet_v2_tablet_tool_notify_distance(tool->tool_v2, + event->distance); + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X) + tool->tilt_x = event->tilt_x; + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y) + tool->tilt_y = event->tilt_y; + if (event->updated_axes & + (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) { + wlr_tablet_v2_tablet_tool_notify_tilt(tool->tool_v2, tool->tilt_x, + tool->tilt_y); + } + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) + wlr_tablet_v2_tablet_tool_notify_rotation(tool->tool_v2, + event->rotation); + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) + wlr_tablet_v2_tablet_tool_notify_slider(tool->tool_v2, event->slider); + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) + wlr_tablet_v2_tablet_tool_notify_wheel(tool->tool_v2, + event->wheel_delta, 0); +} + +void tablettoolbutton(struct wl_listener *listener, void *data) { + struct wlr_tablet_tool_button_event *event = data; + struct TabletTool *tool = event->tool->data; + if (!tool) + return; + wlr_tablet_v2_tablet_tool_notify_button( + tool->tool_v2, event->button, + (enum zwp_tablet_pad_v2_button_state)event->state); +} + +void tablettooltip(struct wl_listener *listener, void *data) { + struct wlr_tablet_tool_tip_event *event = data; + struct TabletTool *tool = event->tool->data; + if (!tool) + return; + + struct wlr_pointer_button_event fakeptrbtnevent = { + .button = BTN_LEFT, + .state = event->state == WLR_TABLET_TOOL_TIP_UP + ? WL_POINTER_BUTTON_STATE_RELEASED + : WL_POINTER_BUTTON_STATE_PRESSED, + .time_msec = event->time_msec, + }; + + if (handle_buttonpress(&fakeptrbtnevent)) + return; + + if (!tool->curr_surface) { + wlr_seat_pointer_notify_button(seat, fakeptrbtnevent.time_msec, + fakeptrbtnevent.button, + fakeptrbtnevent.state); + return; + } + + if (event->state == WLR_TABLET_TOOL_TIP_UP) { + wlr_tablet_v2_tablet_tool_notify_up(tool->tool_v2); + return; + } + + wlr_tablet_v2_tablet_tool_notify_down(tool->tool_v2); + wlr_tablet_tool_v2_start_implicit_grab(tool->tool_v2); +} diff --git a/src/mango.c b/src/mango.c index a34b4072..de682be6 100644 --- a/src/mango.c +++ b/src/mango.c @@ -72,6 +72,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -585,6 +588,7 @@ static void axisnotify(struct wl_listener *listener, void *data); // 滚轮事件处理 static void buttonpress(struct wl_listener *listener, void *data); // 鼠标按键事件处理 +static bool handle_buttonpress(struct wlr_pointer_button_event *event); static int32_t ongesture(struct wlr_pointer_swipe_end_event *event); static void swipe_begin(struct wl_listener *listener, void *data); static void swipe_update(struct wl_listener *listener, void *data); @@ -2205,6 +2209,13 @@ bool check_trackpad_disabled(struct wlr_pointer *pointer) { void // 鼠标按键事件 buttonpress(struct wl_listener *listener, void *data) { struct wlr_pointer_button_event *event = data; + + if (!handle_buttonpress(event)) + wlr_seat_pointer_notify_button(seat, event->time_msec, event->button, + event->state); +} + +bool handle_buttonpress(struct wlr_pointer_button_event *event) { struct wlr_keyboard *hard_keyboard, *keyboard; uint32_t hard_mods, mods; Client *c = NULL; @@ -2219,8 +2230,8 @@ buttonpress(struct wl_listener *listener, void *data) { handlecursoractivity(); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); - if (check_trackpad_disabled(event->pointer)) { - return; + if (event->pointer && check_trackpad_disabled(event->pointer)) { + return true; } switch (event->state) { @@ -2286,7 +2297,7 @@ buttonpress(struct wl_listener *listener, void *data) { if (selmon->isoverview && event->button == BTN_LEFT && c) { toggleoverview(&(Arg){.i = 1}); - return; + return true; } if (selmon->canvas_overview_visible && @@ -2339,7 +2350,7 @@ buttonpress(struct wl_listener *listener, void *data) { if (selmon->isoverview && event->button == BTN_RIGHT && c) { pending_kill_client(c); - return; + return true; } if (CLEANMASK(mods) == CLEANMASK(m->mod) && @@ -2347,7 +2358,7 @@ buttonpress(struct wl_listener *listener, void *data) { (CLEANMASK(m->mod) != 0 || (event->button != BTN_LEFT && event->button != BTN_RIGHT))) { m->func(&m->arg); - return; + return true; } } break; @@ -2391,16 +2402,14 @@ buttonpress(struct wl_listener *listener, void *data) { apply_window_snap(tmpc); } tmpc->drag_to_tile = false; - return; + return true; } else { cursor_mode = CurNormal; } break; } - /* If the event wasn't handled by the compositor, notify the client with - * pointer focus that a button press has occurred */ - wlr_seat_pointer_notify_button(seat, event->time_msec, event->button, - event->state); + /* If the event wasn't handled by the compositor, return false */ + return false; } void checkidleinhibitor(struct wlr_surface *exclude) { @@ -2466,6 +2475,10 @@ void cleanuplisteners(void) { wl_list_remove(&cursor_frame.link); wl_list_remove(&cursor_motion.link); wl_list_remove(&cursor_motion_absolute.link); + wl_list_remove(&tablet_tool_proximity.link); + wl_list_remove(&tablet_tool_axis.link); + wl_list_remove(&tablet_tool_button.link); + wl_list_remove(&tablet_tool_tip.link); wl_list_remove(&gpu_reset.link); wl_list_remove(&new_idle_inhibitor.link); wl_list_remove(&layout_change.link); @@ -3937,6 +3950,12 @@ void inputdevice(struct wl_listener *listener, void *data) { case WLR_INPUT_DEVICE_KEYBOARD: createkeyboard(wlr_keyboard_from_input_device(device)); break; + case WLR_INPUT_DEVICE_TABLET: + createtablet(device); + break; + case WLR_INPUT_DEVICE_TABLET_PAD: + createtabletpad(device); + break; case WLR_INPUT_DEVICE_POINTER: createpointer(wlr_pointer_from_input_device(device)); break; @@ -6460,6 +6479,7 @@ void setup(void) { * clients from the Unix socket, manging Wayland globals, and so on. */ dpy = wl_display_create(); event_loop = wl_display_get_event_loop(dpy); + tablet_mgr = wlr_tablet_v2_create(dpy); /* The backend is a wlroots feature which abstracts the underlying input * and output hardware. The autocreate option will choose the most * suitable backend based on the current environment, such as opening an @@ -6640,6 +6660,11 @@ void setup(void) { wl_signal_add(&cursor->events.button, &cursor_button); wl_signal_add(&cursor->events.axis, &cursor_axis); wl_signal_add(&cursor->events.frame, &cursor_frame); + wl_signal_add(&cursor->events.tablet_tool_proximity, + &tablet_tool_proximity); + wl_signal_add(&cursor->events.tablet_tool_axis, &tablet_tool_axis); + wl_signal_add(&cursor->events.tablet_tool_button, &tablet_tool_button); + wl_signal_add(&cursor->events.tablet_tool_tip, &tablet_tool_tip); // 这两句代码会造成obs窗口里的鼠标光标消失,不知道注释有什么影响 cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); @@ -6654,6 +6679,8 @@ void setup(void) { * to let us know when new input devices are available on the backend. */ wl_list_init(&inputdevices); + wl_list_init(&tablets); + wl_list_init(&tablet_pads); wl_list_init(&keyboard_shortcut_inhibitors); wl_signal_add(&backend->events.new_input, &new_input_device); virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);