mirror of
https://github.com/tiyn/dwl.git
synced 2026-01-11 17:39:45 +01:00
Compare commits
2 Commits
en-keycode
...
hide-behin
| Author | SHA1 | Date | |
|---|---|---|---|
| 2084721901 | |||
| f2780a182b |
@@ -12,7 +12,7 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
||||
static const float focuscolor[] = COLOR(0x005577ff);
|
||||
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
||||
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
|
||||
|
||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||
#define TAGCOUNT (9)
|
||||
|
||||
47
dwl.c
47
dwl.c
@@ -436,11 +436,6 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
|
||||
static struct wl_listener start_drag = {.notify = startdrag};
|
||||
static struct wl_listener new_session_lock = {.notify = locksession};
|
||||
|
||||
static const struct xkb_rule_names en_rules = {.layout = "de"};
|
||||
static struct xkb_context *en_context;
|
||||
static struct xkb_keymap *en_keymap;
|
||||
static struct xkb_state *en_state;
|
||||
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -510,7 +505,9 @@ applyrules(Client *c)
|
||||
void
|
||||
arrange(Monitor *m)
|
||||
{
|
||||
Client *c;
|
||||
LayerSurface *l;
|
||||
Client *c, *sel = focustop(m);
|
||||
int i;
|
||||
|
||||
if (!m->wlr_output->enabled)
|
||||
return;
|
||||
@@ -541,6 +538,26 @@ arrange(Monitor *m)
|
||||
: c->scene->node.parent);
|
||||
}
|
||||
|
||||
if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
|
||||
for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||
wl_list_for_each(l, &sel->mon->layers[i], link)
|
||||
wlr_scene_node_set_enabled(&l->scene->node, 0);
|
||||
}
|
||||
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
if (c->mon != m)
|
||||
continue;
|
||||
wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
|
||||
|| !sel->isfullscreen);
|
||||
}
|
||||
}
|
||||
if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
|
||||
for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||
wl_list_for_each(l, &m->layers[i], link)
|
||||
wlr_scene_node_set_enabled(&l->scene->node, 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (m->lt[m->sellt]->arrange)
|
||||
m->lt[m->sellt]->arrange(m);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
@@ -722,9 +739,6 @@ cleanup(void)
|
||||
wlr_backend_destroy(backend);
|
||||
|
||||
wl_display_destroy(dpy);
|
||||
xkb_state_unref(en_state);
|
||||
xkb_keymap_unref(en_keymap);
|
||||
xkb_context_unref(en_context);
|
||||
/* Destroy after the wayland display (when the monitors are already destroyed)
|
||||
to avoid destroying them with an invalid scene output. */
|
||||
wlr_scene_node_destroy(&scene->tree.node);
|
||||
@@ -1636,19 +1650,16 @@ keypress(struct wl_listener *listener, void *data)
|
||||
/* This event is raised when a key is pressed or released. */
|
||||
KeyboardGroup *group = wl_container_of(listener, group, key);
|
||||
struct wlr_keyboard_key_event *event = data;
|
||||
int nsyms, handled;
|
||||
|
||||
/* Translate libinput keycode -> xkbcommon */
|
||||
uint32_t keycode = event->keycode + 8;
|
||||
/* Get a list of keysyms based on the keymap for this keyboard */
|
||||
const xkb_keysym_t *syms;
|
||||
uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
|
||||
xkb_state_update_key(en_state, keycode,
|
||||
(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
|
||||
? XKB_KEY_DOWN : XKB_KEY_UP);
|
||||
nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
|
||||
int nsyms = xkb_state_key_get_syms(
|
||||
group->wlr_group->keyboard.xkb_state, keycode, &syms);
|
||||
|
||||
handled = 0;
|
||||
int handled = 0;
|
||||
uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
@@ -2630,10 +2641,6 @@ setup(void)
|
||||
* pointer, touch, and drawing tablet device. We also rig up a listener to
|
||||
* let us know when new input devices are available on the backend.
|
||||
*/
|
||||
en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||
en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
|
||||
XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||
en_state = xkb_state_new(en_keymap);
|
||||
wl_signal_add(&backend->events.new_input, &new_input_device);
|
||||
virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
|
||||
wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
From cd61fac9cb6e9d0172e2f7a01e6a514d676ba5f0 Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
|
||||
Date: Tue, 4 Feb 2025 23:53:11 +0100
|
||||
Subject: [PATCH] Always use the English keymap to get keycodes
|
||||
|
||||
---
|
||||
dwl.c | 23 +++++++++++++++++++----
|
||||
1 file changed, 19 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index def2562..c299365 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -413,6 +413,11 @@ static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
+static const struct xkb_rule_names en_rules = {.layout = "us"};
|
||||
+static struct xkb_context *en_context;
|
||||
+static struct xkb_keymap *en_keymap;
|
||||
+static struct xkb_state *en_state;
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -694,6 +699,9 @@ cleanup(void)
|
||||
wlr_backend_destroy(backend);
|
||||
|
||||
wl_display_destroy(dpy);
|
||||
+ xkb_state_unref(en_state);
|
||||
+ xkb_keymap_unref(en_keymap);
|
||||
+ xkb_context_unref(en_context);
|
||||
/* Destroy after the wayland display (when the monitors are already destroyed)
|
||||
to avoid destroying them with an invalid scene output. */
|
||||
wlr_scene_node_destroy(&scene->tree.node);
|
||||
@@ -1582,16 +1590,19 @@ keypress(struct wl_listener *listener, void *data)
|
||||
/* This event is raised when a key is pressed or released. */
|
||||
KeyboardGroup *group = wl_container_of(listener, group, key);
|
||||
struct wlr_keyboard_key_event *event = data;
|
||||
+ int nsyms, handled;
|
||||
|
||||
/* Translate libinput keycode -> xkbcommon */
|
||||
uint32_t keycode = event->keycode + 8;
|
||||
/* Get a list of keysyms based on the keymap for this keyboard */
|
||||
const xkb_keysym_t *syms;
|
||||
- int nsyms = xkb_state_key_get_syms(
|
||||
- group->wlr_group->keyboard.xkb_state, keycode, &syms);
|
||||
-
|
||||
- int handled = 0;
|
||||
uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
|
||||
+ xkb_state_update_key(en_state, keycode,
|
||||
+ (event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
|
||||
+ ? XKB_KEY_DOWN : XKB_KEY_UP);
|
||||
+ nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
|
||||
+
|
||||
+ handled = 0;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
@@ -2607,6 +2618,10 @@ setup(void)
|
||||
* pointer, touch, and drawing tablet device. We also rig up a listener to
|
||||
* let us know when new input devices are available on the backend.
|
||||
*/
|
||||
+ en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||
+ en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
|
||||
+ XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||
+ en_state = xkb_state_new(en_keymap);
|
||||
LISTEN_STATIC(&backend->events.new_input, inputdevice);
|
||||
virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
|
||||
LISTEN_STATIC(&virtual_keyboard_mgr->events.new_virtual_keyboard, virtualkeyboard);
|
||||
--
|
||||
2.48.1
|
||||
|
||||
73
hide-behind-fullscreen.patch
Normal file
73
hide-behind-fullscreen.patch
Normal file
@@ -0,0 +1,73 @@
|
||||
From ac1537f068ea626f1984803ed8db08faf7943b18 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
|
||||
<leohdz172@proton.me>
|
||||
Date: Sun, 10 Apr 2022 22:38:53 -0500
|
||||
Subject: [PATCH] hide-behind-fullscreen
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
|
||||
---
|
||||
config.def.h | 2 +-
|
||||
dwl.c | 24 +++++++++++++++++++++++-
|
||||
2 files changed, 24 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 22d2171d..1d5a4c84 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -12,7 +12,7 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
||||
static const float focuscolor[] = COLOR(0x005577ff);
|
||||
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||
-static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
||||
+static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
|
||||
|
||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||
#define TAGCOUNT (9)
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index ad21e1ba..f5395fe6 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -505,7 +505,9 @@ applyrules(Client *c)
|
||||
void
|
||||
arrange(Monitor *m)
|
||||
{
|
||||
- Client *c;
|
||||
+ LayerSurface *l;
|
||||
+ Client *c, *sel = focustop(m);
|
||||
+ int i;
|
||||
|
||||
if (!m->wlr_output->enabled)
|
||||
return;
|
||||
@@ -536,6 +538,26 @@ arrange(Monitor *m)
|
||||
: c->scene->node.parent);
|
||||
}
|
||||
|
||||
+ if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
|
||||
+ for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||
+ wl_list_for_each(l, &sel->mon->layers[i], link)
|
||||
+ wlr_scene_node_set_enabled(&l->scene->node, 0);
|
||||
+ }
|
||||
+
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c->mon != m)
|
||||
+ continue;
|
||||
+ wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
|
||||
+ || !sel->isfullscreen);
|
||||
+ }
|
||||
+ }
|
||||
+ if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
|
||||
+ for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||
+ wl_list_for_each(l, &m->layers[i], link)
|
||||
+ wlr_scene_node_set_enabled(&l->scene->node, 1);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (m->lt[m->sellt]->arrange)
|
||||
m->lt[m->sellt]->arrange(m);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
--
|
||||
2.48.0
|
||||
|
||||
Reference in New Issue
Block a user