mirror of
https://github.com/tiyn/dwl.git
synced 2026-01-11 17:39:45 +01:00
Compare commits
1 Commits
inputdevic
...
fakefullsc
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e9714417e |
14
config.def.h
14
config.def.h
@@ -60,18 +60,6 @@ static const struct xkb_rule_names xkb_rules = {
|
|||||||
.options = NULL,
|
.options = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* input devices */
|
|
||||||
static const InputRule inputrules[] = {
|
|
||||||
/* name kbcreate ptrcreate */
|
|
||||||
/* ignore bad device - like a touchpad ;) */
|
|
||||||
{ "BAD DEVICE", NULL, NULL },
|
|
||||||
/* ungroup ydotool device - fixes a bug */
|
|
||||||
{ "ydotoold virtual device", createungroupedkeyboard, createpointer },
|
|
||||||
/* put your touchpad name here to enable toggle touchpad */
|
|
||||||
{ "Elan Touchpad", createkeyboard, createtogglepointer },
|
|
||||||
{ NULL, createkeyboard, createpointer },
|
|
||||||
};
|
|
||||||
|
|
||||||
static const int repeat_rate = 25;
|
static const int repeat_rate = 25;
|
||||||
static const int repeat_delay = 600;
|
static const int repeat_delay = 600;
|
||||||
|
|
||||||
@@ -154,7 +142,7 @@ static const Key keys[] = {
|
|||||||
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||||
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
||||||
{ MODKEY, XKB_KEY_u, togglepointer, {0} },
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E, togglefakefullscreen, {0} },
|
||||||
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
|
||||||
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||||
|
|||||||
83
dwl.c
83
dwl.c
@@ -137,16 +137,10 @@ typedef struct {
|
|||||||
#endif
|
#endif
|
||||||
unsigned int bw;
|
unsigned int bw;
|
||||||
uint32_t tags;
|
uint32_t tags;
|
||||||
int isfloating, isurgent, isfullscreen;
|
int isfloating, isurgent, isfullscreen, isfakefullscreen;
|
||||||
uint32_t resize; /* configure serial of a pending resize */
|
uint32_t resize; /* configure serial of a pending resize */
|
||||||
} Client;
|
} Client;
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
const char *name;
|
|
||||||
void (*kbcreate)(struct wlr_keyboard *);
|
|
||||||
void (*ptrcreate)(struct wlr_pointer *);
|
|
||||||
} InputRule;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint32_t mod;
|
uint32_t mod;
|
||||||
xkb_keysym_t keysym;
|
xkb_keysym_t keysym;
|
||||||
@@ -274,8 +268,6 @@ static void createnotify(struct wl_listener *listener, void *data);
|
|||||||
static void createpointer(struct wlr_pointer *pointer);
|
static void createpointer(struct wlr_pointer *pointer);
|
||||||
static void createpointerconstraint(struct wl_listener *listener, void *data);
|
static void createpointerconstraint(struct wl_listener *listener, void *data);
|
||||||
static void createpopup(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 cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
|
||||||
static void cursorframe(struct wl_listener *listener, void *data);
|
static void cursorframe(struct wl_listener *listener, void *data);
|
||||||
static void cursorwarptohint(void);
|
static void cursorwarptohint(void);
|
||||||
@@ -330,6 +322,7 @@ static void run(char *startup_cmd);
|
|||||||
static void setcursor(struct wl_listener *listener, void *data);
|
static void setcursor(struct wl_listener *listener, void *data);
|
||||||
static void setcursorshape(struct wl_listener *listener, void *data);
|
static void setcursorshape(struct wl_listener *listener, void *data);
|
||||||
static void setfloating(Client *c, int floating);
|
static void setfloating(Client *c, int floating);
|
||||||
|
static void setfakefullscreen(Client *c, int fullscreen);
|
||||||
static void setfullscreen(Client *c, int fullscreen);
|
static void setfullscreen(Client *c, int fullscreen);
|
||||||
static void setlayout(const Arg *arg);
|
static void setlayout(const Arg *arg);
|
||||||
static void setmfact(const Arg *arg);
|
static void setmfact(const Arg *arg);
|
||||||
@@ -344,7 +337,7 @@ static void tagmon(const Arg *arg);
|
|||||||
static void tile(Monitor *m);
|
static void tile(Monitor *m);
|
||||||
static void togglefloating(const Arg *arg);
|
static void togglefloating(const Arg *arg);
|
||||||
static void togglefullscreen(const Arg *arg);
|
static void togglefullscreen(const Arg *arg);
|
||||||
static void togglepointer(const Arg *arg);
|
static void togglefakefullscreen(const Arg *arg);
|
||||||
static void toggletag(const Arg *arg);
|
static void toggletag(const Arg *arg);
|
||||||
static void toggleview(const Arg *arg);
|
static void toggleview(const Arg *arg);
|
||||||
static void unlocksession(struct wl_listener *listener, void *data);
|
static void unlocksession(struct wl_listener *listener, void *data);
|
||||||
@@ -445,8 +438,6 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
|
|||||||
static struct wl_listener start_drag = {.notify = startdrag};
|
static struct wl_listener start_drag = {.notify = startdrag};
|
||||||
static struct wl_listener new_session_lock = {.notify = locksession};
|
static struct wl_listener new_session_lock = {.notify = locksession};
|
||||||
|
|
||||||
static struct libinput_device *togglepointerdevice = NULL;
|
|
||||||
|
|
||||||
#ifdef XWAYLAND
|
#ifdef XWAYLAND
|
||||||
static void activatex11(struct wl_listener *listener, void *data);
|
static void activatex11(struct wl_listener *listener, void *data);
|
||||||
static void associatex11(struct wl_listener *listener, void *data);
|
static void associatex11(struct wl_listener *listener, void *data);
|
||||||
@@ -1207,33 +1198,6 @@ createpopup(struct wl_listener *listener, void *data)
|
|||||||
LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
|
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
|
void
|
||||||
cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
|
cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
|
||||||
{
|
{
|
||||||
@@ -1617,27 +1581,13 @@ inputdevice(struct wl_listener *listener, void *data)
|
|||||||
* available. */
|
* available. */
|
||||||
struct wlr_input_device *device = data;
|
struct wlr_input_device *device = data;
|
||||||
uint32_t caps;
|
uint32_t caps;
|
||||||
const InputRule *r;
|
|
||||||
|
|
||||||
switch (device->type) {
|
switch (device->type) {
|
||||||
case WLR_INPUT_DEVICE_KEYBOARD:
|
case WLR_INPUT_DEVICE_KEYBOARD:
|
||||||
for (r = inputrules; r < END(inputrules); r++) {
|
createkeyboard(wlr_keyboard_from_input_device(device));
|
||||||
if (!r->name || strstr(device->name, r->name)) {
|
|
||||||
if (r->kbcreate)
|
|
||||||
r->kbcreate(wlr_keyboard_from_input_device(device));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case WLR_INPUT_DEVICE_POINTER:
|
case WLR_INPUT_DEVICE_POINTER:
|
||||||
for (r = inputrules; r < END(inputrules); r++) {
|
createpointer(wlr_pointer_from_input_device(device));
|
||||||
if (!r->name || strstr(device->name, r->name)) {
|
|
||||||
if (r->ptrcreate)
|
|
||||||
r->ptrcreate(wlr_pointer_from_input_device(device));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* TODO handle other input device types */
|
/* TODO handle other input device types */
|
||||||
@@ -2243,6 +2193,17 @@ requeststartdrag(struct wl_listener *listener, void *data)
|
|||||||
wlr_data_source_destroy(event->drag->source);
|
wlr_data_source_destroy(event->drag->source);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
setfakefullscreen(Client *c, int fullscreen)
|
||||||
|
{
|
||||||
|
c->isfakefullscreen = fullscreen;
|
||||||
|
if (!c->mon)
|
||||||
|
return;
|
||||||
|
if (c->isfullscreen)
|
||||||
|
setfullscreen(c, 0);
|
||||||
|
client_set_fullscreen(c, fullscreen);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
requestmonstate(struct wl_listener *listener, void *data)
|
requestmonstate(struct wl_listener *listener, void *data)
|
||||||
{
|
{
|
||||||
@@ -2808,15 +2769,11 @@ togglefullscreen(const Arg *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
togglepointer(const Arg *arg)
|
togglefakefullscreen(const Arg *arg)
|
||||||
{
|
{
|
||||||
if (!togglepointerdevice)
|
Client *sel = focustop(selmon);
|
||||||
return;
|
if (sel)
|
||||||
|
setfakefullscreen(sel, !sel->isfakefullscreen);
|
||||||
libinput_device_config_send_events_set_mode(
|
|
||||||
togglepointerdevice,
|
|
||||||
libinput_device_config_send_events_get_mode(togglepointerdevice) ^ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
87
fakefullscreenclient.patch
Normal file
87
fakefullscreenclient.patch
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
From 2ec6d0c668b4daee601337f8da45ccfa3a7d5fc6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: choc <notchoc@proton.me>
|
||||||
|
Date: Fri, 29 Mar 2024 22:50:00 +0800
|
||||||
|
Subject: [PATCH] implement fakefullscreenclient
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 1 +
|
||||||
|
dwl.c | 23 ++++++++++++++++++++++-
|
||||||
|
2 files changed, 23 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 9009517..8c220eb 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -137,6 +137,7 @@ static const Key keys[] = {
|
||||||
|
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||||
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
||||||
|
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E, togglefakefullscreen, {0} },
|
||||||
|
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
||||||
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
|
||||||
|
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
||||||
|
diff --git a/dwl.c b/dwl.c
|
||||||
|
index 5867b0c..1e78491 100644
|
||||||
|
--- a/dwl.c
|
||||||
|
+++ b/dwl.c
|
||||||
|
@@ -137,7 +137,7 @@ typedef struct {
|
||||||
|
#endif
|
||||||
|
unsigned int bw;
|
||||||
|
uint32_t tags;
|
||||||
|
- int isfloating, isurgent, isfullscreen;
|
||||||
|
+ int isfloating, isurgent, isfullscreen, isfakefullscreen;
|
||||||
|
uint32_t resize; /* configure serial of a pending resize */
|
||||||
|
} Client;
|
||||||
|
|
||||||
|
@@ -318,6 +318,7 @@ static void setcursor(struct wl_listener *listener, void *data);
|
||||||
|
static void setcursorshape(struct wl_listener *listener, void *data);
|
||||||
|
static void setfloating(Client *c, int floating);
|
||||||
|
static void setfullscreen(Client *c, int fullscreen);
|
||||||
|
+static void setfakefullscreen(Client *c, int fullscreen);
|
||||||
|
static void setgamma(struct wl_listener *listener, void *data);
|
||||||
|
static void setlayout(const Arg *arg);
|
||||||
|
static void setmfact(const Arg *arg);
|
||||||
|
@@ -332,6 +333,7 @@ static void tagmon(const Arg *arg);
|
||||||
|
static void tile(Monitor *m);
|
||||||
|
static void togglefloating(const Arg *arg);
|
||||||
|
static void togglefullscreen(const Arg *arg);
|
||||||
|
+static void togglefakefullscreen(const Arg *arg);
|
||||||
|
static void toggletag(const Arg *arg);
|
||||||
|
static void toggleview(const Arg *arg);
|
||||||
|
static void unlocksession(struct wl_listener *listener, void *data);
|
||||||
|
@@ -2181,6 +2183,17 @@ setfullscreen(Client *c, int fullscreen)
|
||||||
|
printstatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+setfakefullscreen(Client *c, int fullscreen)
|
||||||
|
+{
|
||||||
|
+ c->isfakefullscreen = fullscreen;
|
||||||
|
+ if (!c->mon)
|
||||||
|
+ return;
|
||||||
|
+ if (c->isfullscreen)
|
||||||
|
+ setfullscreen(c, 0);
|
||||||
|
+ client_set_fullscreen(c, fullscreen);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
setgamma(struct wl_listener *listener, void *data)
|
||||||
|
{
|
||||||
|
@@ -2620,6 +2633,14 @@ togglefullscreen(const Arg *arg)
|
||||||
|
setfullscreen(sel, !sel->isfullscreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+togglefakefullscreen(const Arg *arg)
|
||||||
|
+{
|
||||||
|
+ Client *sel = focustop(selmon);
|
||||||
|
+ if (sel)
|
||||||
|
+ setfakefullscreen(sel, !sel->isfakefullscreen);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
toggletag(const Arg *arg)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
From 89f870a04f903681b0a7a0ac4eb1ae70c4984b46 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Collerson <benc@benc.cc>
|
|
||||||
Date: Sat, 15 Jun 2024 12:34:01 +1000
|
|
||||||
Subject: [PATCH] input device rules
|
|
||||||
|
|
||||||
* customise input device handling
|
|
||||||
* ignore unwanted input devices
|
|
||||||
* configure a toggle for an input device
|
|
||||||
---
|
|
||||||
config.def.h | 13 ++++++++++
|
|
||||||
dwl.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++--
|
|
||||||
2 files changed, 79 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 22d2171d..0b287ab5 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -60,6 +60,18 @@ static const struct xkb_rule_names xkb_rules = {
|
|
||||||
.options = NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* input devices */
|
|
||||||
+static const InputRule inputrules[] = {
|
|
||||||
+ /* name kbcreate ptrcreate */
|
|
||||||
+ /* ignore bad device - like a touchpad ;) */
|
|
||||||
+ { "BAD DEVICE", NULL, NULL },
|
|
||||||
+ /* ungroup ydotool device - fixes a bug */
|
|
||||||
+ { "ydotoold virtual device", createungroupedkeyboard, createpointer },
|
|
||||||
+ /* put your touchpad name here to enable toggle touchpad */
|
|
||||||
+ { "Elan Touchpad", createkeyboard, createtogglepointer },
|
|
||||||
+ { NULL, createkeyboard, createpointer },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const int repeat_rate = 25;
|
|
||||||
static const int repeat_delay = 600;
|
|
||||||
|
|
||||||
@@ -142,6 +154,7 @@ static const Key keys[] = {
|
|
||||||
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
|
||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
|
||||||
+ { MODKEY, XKB_KEY_u, togglepointer, {0} },
|
|
||||||
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
|
|
||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
|
|
||||||
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
|
|
||||||
diff --git a/dwl.c b/dwl.c
|
|
||||||
index a2711f67..f6f91938 100644
|
|
||||||
--- a/dwl.c
|
|
||||||
+++ b/dwl.c
|
|
||||||
@@ -143,6 +143,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;
|
|
||||||
@@ -270,6 +276,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);
|
|
||||||
@@ -340,6 +348,7 @@ static void tagmon(const Arg *arg);
|
|
||||||
static void tile(Monitor *m);
|
|
||||||
static void togglefloating(const Arg *arg);
|
|
||||||
static void togglefullscreen(const Arg *arg);
|
|
||||||
+static void togglepointer(const Arg *arg);
|
|
||||||
static void toggletag(const Arg *arg);
|
|
||||||
static void toggleview(const Arg *arg);
|
|
||||||
static void unlocksession(struct wl_listener *listener, void *data);
|
|
||||||
@@ -413,6 +422,8 @@ static struct wlr_box sgeom;
|
|
||||||
static struct wl_list mons;
|
|
||||||
static Monitor *selmon;
|
|
||||||
|
|
||||||
+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);
|
|
||||||
@@ -1133,6 +1144,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)
|
|
||||||
{
|
|
||||||
@@ -1531,13 +1569,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 */
|
|
||||||
@@ -2739,6 +2791,18 @@ togglefullscreen(const Arg *arg)
|
|
||||||
setfullscreen(sel, !sel->isfullscreen);
|
|
||||||
}
|
|
||||||
|
|
||||||
+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)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user