amolinae06/dwl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

applied inputdevicerules patch

Browse source
This commit is contained in:
λmolinae 2025-01-31 13:15:27 -06:00
parent 31a414c2f2
commit 1245fbda0e
4 changed files with 96 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

68
dwl.c
View file

@ -152,6 +152,12 @@ typedef struct {
uint32_t resize; /* configure serial of a pending resize */
} Client;
typedef struct {
const char *name;
void (*kbcreate)(struct wlr_keyboard *);
void (*ptrcreate)(struct wlr_pointer *);
} InputRule;
typedef struct {
uint32_t mod;
xkb_keysym_t keysym;
@ -312,6 +318,8 @@ static void createnotify(struct wl_listener *listener, void *data);
static void createpointer(struct wlr_pointer *pointer);
static void createpointerconstraint(struct wl_listener *listener, void *data);
static void createpopup(struct wl_listener *listener, void *data);
static void createtogglepointer(struct wlr_pointer *pointer);
static void createungroupedkeyboard(struct wlr_keyboard *keyboard);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data);
static void cursorwarptohint(void);
@ -397,6 +405,7 @@ static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void togglesticky(const Arg *arg);
static void togglefullscreen(const Arg *arg);
static void togglepointer(const Arg *arg);
static void togglegaps(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
@ -490,6 +499,8 @@ static struct xkb_keymap *en_keymap;
static struct xkb_state *en_state, *en_state_shift;
static xkb_mod_index_t en_shift;
static struct libinput_device *togglepointerdevice = NULL;
#ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data);
static void associatex11(struct wl_listener *listener, void *data);
@ -1419,6 +1430,33 @@ createpopup(struct wl_listener *listener, void *data)
LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
}
void
createtogglepointer(struct wlr_pointer *pointer)
{
struct libinput_device *device;
createpointer(pointer);
if (wlr_input_device_is_libinput(&pointer->base)
&& (device = wlr_libinput_get_device_handle(&pointer->base))) {
togglepointerdevice = device;
}
}
void
createungroupedkeyboard(struct wlr_keyboard *keyboard)
{
/* for keyboards that need their own keyboard group */
KeyboardGroup *group = createkeyboardgroup();
/* Set the keymap to match the group keymap */
wlr_keyboard_set_keymap(keyboard, group->wlr_group->keyboard.keymap);
LISTEN(&keyboard->base.events.destroy, &group->destroy, destroykeyboardgroup);
/* Add the new keyboard to the group */
wlr_keyboard_group_add_keyboard(group->wlr_group, keyboard);
}
void
cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
{
@ -1983,13 +2021,27 @@ inputdevice(struct wl_listener *listener, void *data)
* available. */
struct wlr_input_device *device = data;
uint32_t caps;
const InputRule *r;
switch (device->type) {
case WLR_INPUT_DEVICE_KEYBOARD:
createkeyboard(wlr_keyboard_from_input_device(device));
for (r = inputrules; r < END(inputrules); r++) {
if (!r->name || strstr(device->name, r->name)) {
if (r->kbcreate)
r->kbcreate(wlr_keyboard_from_input_device(device));
break;
}
}
break;
case WLR_INPUT_DEVICE_POINTER:
createpointer(wlr_pointer_from_input_device(device));
for (r = inputrules; r < END(inputrules); r++) {
if (!r->name || strstr(device->name, r->name)) {
if (r->ptrcreate)
r->ptrcreate(wlr_pointer_from_input_device(device));
break;
}
}
break;
default:
/* TODO handle other input device types */
@ -3236,6 +3288,18 @@ togglesticky(const Arg *arg)
setsticky(c, !c->issticky);
}
void
togglepointer(const Arg *arg)
{
if (!togglepointerdevice)
return;
libinput_device_config_send_events_set_mode(
togglepointerdevice,
libinput_device_config_send_events_get_mode(togglepointerdevice) ^ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
);
}
void
toggletag(const Arg *arg)
{