summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe <rbo@gmx.us>2025-03-02 21:14:49 +0100
committerJoe <rbo@gmx.us>2025-03-02 21:14:49 +0100
commit676d246d8195de97d01b4a9b4f1aa901545fd9d4 (patch)
tree1c3143dc0997c0a94519e34e812180d1e262137e
parentup (diff)
downloaddwl-676d246d8195de97d01b4a9b4f1aa901545fd9d4.tar.gz
dwl-676d246d8195de97d01b4a9b4f1aa901545fd9d4.tar.bz2
dwl-676d246d8195de97d01b4a9b4f1aa901545fd9d4.tar.xz
dwl-676d246d8195de97d01b4a9b4f1aa901545fd9d4.tar.zst
dwl-676d246d8195de97d01b4a9b4f1aa901545fd9d4.zip
keysjozan
-rw-r--r--compile_commands.json6
-rw-r--r--config.def.h4
-rw-r--r--dwl.c11
3 files changed, 17 insertions, 4 deletions
diff --git a/compile_commands.json b/compile_commands.json
index baed3a5..470edfb 100644
--- a/compile_commands.json
+++ b/compile_commands.json
@@ -17,7 +17,8 @@
"-I.",
"-DWLR_USE_UNSTABLE",
"-D_POSIX_C_SOURCE=200809L",
- "-DVERSION=\"v0.7-1-g9f5a295-dirty\"",
+ "-DVERSION=\"v0.7-27-gbaf012c\"",
+ "-DXWAYLAND",
"-g",
"-pedantic",
"-Wall",
@@ -58,7 +59,8 @@
"-I.",
"-DWLR_USE_UNSTABLE",
"-D_POSIX_C_SOURCE=200809L",
- "-DVERSION=\"v0.7-1-g9f5a295-dirty\"",
+ "-DVERSION=\"v0.7-27-gbaf012c\"",
+ "-DXWAYLAND",
"-g",
"-pedantic",
"-Wall",
diff --git a/config.def.h b/config.def.h
index b6f10de..0d71c5e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -219,7 +219,9 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
/* commands */
static const char *termcmd[] = { "alacritty", NULL };
+static const char *hardflip_cmd[] = { "alacritty", "-e", "hf", NULL };
static const char *menucmd[] = { "dmrun", NULL };
+static const char *dmapps_cmd[] = { "dmapps", NULL };
static const char *dmlog_cmd[] = { "dmlog", NULL };
static const char *dmpass_full_cmd[] = { "dmpass", "--full", NULL };
static const char *dmpass_cmd[] = { "dmpass", NULL };
@@ -231,6 +233,8 @@ static const Key keys[] = {
/* modifier key function argument */
{ MODKEY, XKB_KEY_p, wmenuspawn, {.v = menucmd } },
{ MODKEY, XKB_KEY_Return, spawn, {.v = termcmd } },
+ { MODKEY|CTRL|SHIFT, XKB_KEY_Return, spawn, {.v = hardflip_cmd } },
+ { MODKEY|CTRL, XKB_KEY_Return, wmenuspawn, {.v = dmapps_cmd } },
{ MODKEY, XKB_KEY_F1, togglescratch, {.v = spterm } },
{ MODKEY, XKB_KEY_F2, togglescratch, {.v = spfm } },
{ MODKEY|SHIFT, XKB_KEY_F2, togglescratch, {.v = sppcman } },
diff --git a/dwl.c b/dwl.c
index 38de151..5f15ced 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1869,8 +1869,16 @@ focusclient(Client *c, int lift)
if (c && lift)
wlr_scene_node_raise_to_top(&c->scene->node);
- if (c && client_surface(c) == old)
+ if (c && client_surface(c) == old && !seat->drag) {
+ focused_tag = selmon->tagset[selmon->seltags];
+ for (i = 0; i < LENGTH(tags); i++) {
+ if (focused_tag & (1 << (i - 1))) {
+ break;
+ }
+ }
+ client_set_border_color(c, (float[])COLOR(tagsel[i - 1][0]));
return;
+ }
if ((old_client_type = toplevel_from_wlr_surface(old, &old_c, &old_l)) == XDGShell) {
struct wlr_xdg_popup *popup, *tmp;
@@ -3935,7 +3943,6 @@ winview(const Arg *a) {
return;
b.ui = sel -> tags;
view(&b);
- focusclient(sel, 1);
return;
}